moduleapi, modulemanager: Re-structure module.event_handlers so that the same handler...

[prosody.git] / core / modulemanager.lua

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index aca314c0b6619cf7b27716e7fa148846e2760cc0..417dedbe34d7c2c1517f5d4995a11bb550a39616 100644 (file)
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -14,15 +14,9 @@ local pluginloader = require "util.pluginloader";
 local hosts = hosts;
 local prosody = prosody;
 
-local loadfile, pcall, xpcall = loadfile, pcall, xpcall;
-local setmetatable, setfenv, getfenv = setmetatable, setfenv, getfenv;
-local pairs, ipairs = pairs, ipairs;
-local t_insert, t_concat = table.insert, table.concat;
-local type = type;
-local next = next;
-local rawget = rawget;
-local error = error;
-local tostring, tonumber = tostring, tonumber;
+local pcall, xpcall = pcall, xpcall;
+local setmetatable, rawget, setfenv = setmetatable, rawget, setfenv;
+local pairs, type, tostring = pairs, type, tostring;
 
 local debug_traceback = debug.traceback;
 local unpack, select = unpack, select;
@@ -32,10 +26,10 @@ pcall = function(f, ...)
        return xpcall(function() return f(unpack(params, 1, n)) end, function(e) return tostring(e).."\n"..debug_traceback(); end);
 end
 
-local array, set = require "util.array", require "util.set";
+local set = require "util.set";
 
 local autoload_modules = {"presence", "message", "iq", "offline", "c2s", "s2s"};
-local component_inheritable_modules = {"tls", "dialback", "iq"};
+local component_inheritable_modules = {"tls", "dialback", "iq", "s2s"};
 
 -- We need this to let modules access the real global namespace
 local _G = _G;
@@ -47,8 +41,6 @@ local api = _G.require "core.moduleapi"; -- Module API container
 -- [host] = { [module] = module_env }
 local modulemap = { ["*"] = {} };
 
-local NULL = {};
-
 -- Load modules when a host is activated
 function load_modules_for_host(host)
        local component = config.get(host, "core", "component_module");
@@ -82,6 +74,9 @@ function load_modules_for_host(host)
        end
 end
 prosody.events.add_handler("host-activated", load_modules_for_host);
+prosody.events.add_handler("host-deactivated", function (host)
+       modulemap[host] = nil;
+end);
 
 --- Private helpers ---
 
@@ -96,8 +91,8 @@ local function do_unload_module(host, name)
                end
        end
        
-       for handler, event in pairs(mod.module.event_handlers) do
-               event.object.remove_handler(event.name, handler);
+       for event, data in pairs(mod.module.event_handlers) do
+               data.object.remove_handler(event, data.handler);
        end
        
        if mod.module.items then -- remove items
@@ -110,6 +105,7 @@ local function do_unload_module(host, name)
                        end
                end
        end
+       mod.module.loaded = false;
        modulemap[host][name] = nil;
        return true;
 end
@@ -141,11 +137,14 @@ local function do_load_module(host, module_name)
                        },{
                                __index = modulemap["*"][module_name].module;
                        });
-                       local ok, result, module_err = call_module_method(mod, "add_host", host_module_api);
-                       if not ok or result == false then return nil, ok and module_err or result; end
                        local host_module = setmetatable({ module = host_module_api }, { __index = mod });
-                       host_module.module.environment = host_module;
+                       host_module_api.environment = host_module;
                        modulemap[host][module_name] = host_module;
+                       local ok, result, module_err = call_module_method(mod, "add_host", host_module_api);
+                       if not ok or result == false then
+                               modulemap[host][module_name] = nil;
+                               return nil, ok and module_err or result;
+                       end
                        return host_module;
                end
                return nil, "global-module-already-loaded";
@@ -168,6 +167,7 @@ local function do_load_module(host, module_name)
        
        setfenv(mod, pluginenv);
        
+       modulemap[host][module_name] = pluginenv;
        local ok, err = pcall(mod);
        if ok then
                -- Call module's "load"
@@ -178,19 +178,23 @@ local function do_load_module(host, module_name)
                        end
                end
 
-               modulemap[api_instance.host][module_name] = pluginenv;
                if api_instance.host == "*" then
                        if not api_instance.global then -- COMPAT w/pre-0.9
-                               log("warn", "mod_%s: Setting module.host = '*' deprecated, call module:set_global() instead", module_name);
+                               if host ~= "*" then
+                                       log("warn", "mod_%s: Setting module.host = '*' deprecated, call module:set_global() instead", module_name);
+                               end
                                api_instance:set_global();
                        end
+                       modulemap[host][module_name] = nil;
+                       modulemap[api_instance.host][module_name] = pluginenv;
                        if host ~= api_instance.host and module_has_method(pluginenv, "add_host") then
                                -- Now load the module again onto the host it was originally being loaded on
-                               do_load_module(host, module_name);
+                               ok, err = do_load_module(host, module_name);
                        end
                end
        end
        if not ok then
+               modulemap[api_instance.host][module_name] = nil;
                log("error", "Error initializing module '%s' on '%s': %s", module_name, host, err or "nil");
        end
        return ok and pluginenv, err;
@@ -242,7 +246,7 @@ end
 function load(host, name)
        local mod, err = do_load_module(host, name);
        if mod then
-               (hosts[mod.module.host] or prosody).events.fire_event("module-loaded", { module = name, host = host });
+               (hosts[mod.module.host] or prosody).events.fire_event("module-loaded", { module = name, host = mod.module.host });
        end
        return mod, err;
 end
@@ -257,13 +261,15 @@ function unload(host, name)
 end
 
 function reload(host, name)
-       local ok, err = do_reload_module(host, name);
-       if ok then
+       local mod, err = do_reload_module(host, name);
+       if mod then
+               modulemap[host][name].module.reloading = true;
                (hosts[host] or prosody).events.fire_event("module-reloaded", { module = name, host = host });
+               mod.module.reloading = nil;
        elseif not is_loaded(host, name) then
                (hosts[host] or prosody).events.fire_event("module-unloaded", { module = name, host = host });
        end
-       return ok, err;
+       return mod, err;
 end
 
 function get_module(host, name)