mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 21:57:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

core.modulemanager, core.moduleapi: Hack around dependency loop

Browse source
This commit is contained in:
Kim Alvefur 2014-09-17 14:48:49 +02:00
parent a36064641e
commit 93a297bc8f
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
core/moduleapi.lua
View file

@ -7,7 +7,7 @@
-- --
local config = require "core.configmanager"; local config = require "core.configmanager";
local modulemanager = require "modulemanager"; -- This is necessary to avoid require loops local modulemanager; -- This gets set from modulemanager
local array = require "util.array"; local array = require "util.array";
local set = require "util.set"; local set = require "util.set";
local logger = require "util.logger"; local logger = require "util.logger";
@ -370,4 +370,7 @@ function api:open_store(name, type)
return require"core.storagemanager".open(self.host, name or self.name, type); return require"core.storagemanager".open(self.host, name or self.name, type);
end end
return api; return function (mm)
modulemanager = mm;
return api;
end

2
core/modulemanager.lua
View file

@ -37,7 +37,7 @@ local _G = _G;
module "modulemanager" module "modulemanager"
local api = _G.require "core.moduleapi"; -- Module API container local api = _G.require "core.moduleapi"(_M); -- Module API container
-- [host] = { [module] = module_env } -- [host] = { [module] = module_env }
local modulemap = { ["*"] = {} }; local modulemap = { ["*"] = {} };