Merge 0.10->trunk

[prosody.git] / core / modulemanager.lua

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 2e488fd5e4556c061aa9c0734bdb87cb4441edf3..7bed17950e0c435eeac929d4cde535c153a00649 100644 (file)
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -13,31 +13,33 @@ local pluginloader = require "util.pluginloader";
 local set = require "util.set";
 
 local new_multitable = require "util.multitable".new;
+local api = require "core.moduleapi"; -- Module API container
 
 local hosts = hosts;
 local prosody = prosody;
 
-local pcall, xpcall = pcall, xpcall;
+local xpcall = xpcall;
 local setmetatable, rawget = setmetatable, rawget;
 local ipairs, pairs, type, tostring, t_insert = ipairs, pairs, type, tostring, table.insert;
 
 local debug_traceback = debug.traceback;
-local unpack, select = unpack, select;
-pcall = function(f, ...)
+local select = select;
+local unpack = table.unpack or unpack; --luacheck: ignore 113
+local pcall = function(f, ...)
        local n = select("#", ...);
        local params = {...};
        return xpcall(function() return f(unpack(params, 1, n)) end, function(e) return tostring(e).."\n"..debug_traceback(); end);
 end
 
-local autoload_modules = {prosody.platform, "presence", "message", "iq", "offline", "c2s", "s2s"};
-local component_inheritable_modules = {"tls", "dialback", "iq", "s2s"};
+local autoload_modules = {prosody.platform, "presence", "message", "iq", "offline", "c2s", "s2s", "s2s_auth_certs"};
+local component_inheritable_modules = {"tls", "saslauth", "dialback", "iq", "s2s"};
 
 -- We need this to let modules access the real global namespace
 local _G = _G;
 
-module "modulemanager"
+local _ENV = nil;
 
-local api = _G.require "core.moduleapi"; -- Module API container
+local load_modules_for_host, load, unload, reload, get_module, get_items, get_modules, is_loaded, module_has_method, call_module_method;
 
 -- [host] = { [module] = module_env }
 local modulemap = { ["*"] = {} };
@@ -123,7 +125,9 @@ local function do_load_module(host, module_name, state)
        end
 
        if modulemap[host][module_name] then
-               log("warn", "%s is already loaded for %s, so not loading again", module_name, host);
+               if not modulemap["*"][module_name] then
+                       log("debug", "%s is already loaded for %s, so not loading again", module_name, host);
+               end
                return nil, "module-already-loaded";
        elseif modulemap["*"][module_name] then
                local mod = modulemap["*"][module_name];
@@ -131,7 +135,7 @@ local function do_load_module(host, module_name, state)
                        local _log = logger.init(host..":"..module_name);
                        local host_module_api = setmetatable({
                                host = host, event_handlers = new_multitable(), items = {};
-                               _log = _log, log = function (self, ...) return _log(...); end;
+                               _log = _log, log = function (self, ...) return _log(...); end; --luacheck: ignore 212/self
                        },{
                                __index = modulemap["*"][module_name].module;
                        });
@@ -152,8 +156,9 @@ local function do_load_module(host, module_name, state)
 
        local _log = logger.init(host..":"..module_name);
        local api_instance = setmetatable({ name = module_name, host = host,
-               _log = _log, log = function (self, ...) return _log(...); end, event_handlers = new_multitable(),
-               reloading = not not state, saved_state = state~=true and state or nil }
+               _log = _log, log = function (self, ...) return _log(...); end, --luacheck: ignore 212/self
+               event_handlers = new_multitable(), reloading = not not state,
+               saved_state = state~=true and state or nil }
                , { __index = api });
 
        local pluginenv = setmetatable({ module = api_instance }, { __index = _G });
@@ -316,4 +321,15 @@ function call_module_method(module, method, ...)
        end
 end
 
-return _M;
+return {
+       load_modules_for_host = load_modules_for_host;
+       load = load;
+       unload = unload;
+       reload = reload;
+       get_module = get_module;
+       get_items = get_items;
+       get_modules = get_modules;
+       is_loaded = is_loaded;
+       module_has_method = module_has_method;
+       call_module_method = call_module_method;
+};