X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fmodulemanager.lua;h=535c227b13e908d25ad9346c78c7f63c9ac0c85a;hb=b85f75e110d99b890fc22186cb2ad4d0c8f1d0a5;hp=f0648667651add3ce1924a20b24b86084fc19cb5;hpb=fcccc6ee48e6fdced52735ad8d719fb3507eb800;p=prosody.git

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index f0648667..535c227b 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -10,19 +10,16 @@ local logger = require "util.logger";
 local log = logger.init("modulemanager");
 local config = require "core.configmanager";
 local pluginloader = require "util.pluginloader";
+local set = require "util.set";
+
+local new_multitable = require "util.multitable".new;
 
 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 = 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;
@@ -32,10 +29,8 @@ 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 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,16 +42,14 @@ 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");
+	local component = config.get(host, "component_module");
 	
-	local global_modules_enabled = config.get("*", "core", "modules_enabled");
-	local global_modules_disabled = config.get("*", "core", "modules_disabled");
-	local host_modules_enabled = config.get(host, "core", "modules_enabled");
-	local host_modules_disabled = config.get(host, "core", "modules_disabled");
+	local global_modules_enabled = config.get("*", "modules_enabled");
+	local global_modules_disabled = config.get("*", "modules_disabled");
+	local host_modules_enabled = config.get(host, "modules_enabled");
+	local host_modules_disabled = config.get(host, "modules_disabled");
 	
 	if host_modules_enabled == global_modules_enabled then host_modules_enabled = nil; end
 	if host_modules_disabled == global_modules_disabled then host_modules_disabled = nil; end
@@ -82,6 +75,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 +92,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 object, event, handler in mod.module.event_handlers:iter(nil, nil, nil) do
+		object.remove_handler(event, handler);
 	end
 	
 	if mod.module.items then -- remove items
@@ -110,11 +106,12 @@ local function do_unload_module(host, name)
 			end
 		end
 	end
+	mod.module.loaded = false;
 	modulemap[host][name] = nil;
 	return true;
 end
 
-local function do_load_module(host, module_name)
+local function do_load_module(host, module_name, state)
 	if not (host and module_name) then
 		return nil, "insufficient-parameters";
 	elseif not hosts[host] and host ~= "*"then
@@ -122,10 +119,7 @@ local function do_load_module(host, module_name)
 	end
 	
 	if not modulemap[host] then
-		modulemap[host] = {};
-		if host ~= "*" then
-			hosts[host].modules = modulemap[host];
-		end
+		modulemap[host] = hosts[host].modules;
 	end
 	
 	if modulemap[host][module_name] then
@@ -136,38 +130,44 @@ local function do_load_module(host, module_name)
 		if module_has_method(mod, "add_host") then
 			local _log = logger.init(host..":"..module_name);
 			local host_module_api = setmetatable({
-				host = host, event_handlers = {}, items = {};
+				host = host, event_handlers = new_multitable(), items = {};
 				_log = _log, log = function (self, ...) return _log(...); end;
 			},{
 				__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";
 	end
 	
 
-	local mod, err = pluginloader.load_code(module_name);
-	if not mod then
-		log("error", "Unable to load module '%s': %s", module_name or "nil", err or "nil");
-		return nil, err;
-	end
 
 	local _log = logger.init(host..":"..module_name);
-	local api_instance = setmetatable({ name = module_name, host = host, path = err,
-		_log = _log, log = function (self, ...) return _log(...); end, event_handlers = {} }
+	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 }
 		, { __index = api });
 
 	local pluginenv = setmetatable({ module = api_instance }, { __index = _G });
 	api_instance.environment = pluginenv;
 	
-	setfenv(mod, pluginenv);
-	
+	local mod, err = pluginloader.load_code(module_name, nil, pluginenv);
+	if not mod then
+		log("error", "Unable to load module '%s': %s", module_name or "nil", err or "nil");
+		return nil, err;
+	end
+
+	api_instance.path = err;
+
+	modulemap[host][module_name] = pluginenv;
 	local ok, err = pcall(mod);
 	if ok then
 		-- Call module's "load"
@@ -177,13 +177,17 @@ local function do_load_module(host, module_name)
 				log("warn", "Error loading module '%s' on '%s': %s", module_name, host, err or "nil");
 			end
 		end
+		api_instance.reloading, api_instance.saved_state = nil, nil;
 
-		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
 				ok, err = do_load_module(host, module_name);
@@ -191,6 +195,7 @@ local function do_load_module(host, module_name)
 		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;
@@ -213,7 +218,7 @@ local function do_reload_module(host, name)
 			saved = ret;
 		else
 			log("warn", "Error saving module '%s:%s' state: %s", host, name, ret);
-			if not config.get(host, "core", "force_module_reload") then
+			if not config.get(host, "force_module_reload") then
 				log("warn", "Aborting reload due to error, set force_module_reload to ignore this");
 				return nil, "save-state-failed";
 			else
@@ -222,8 +227,9 @@ local function do_reload_module(host, name)
 		end
 	end
 
+	mod.module.reloading = true;
 	do_unload_module(host, name);
-	local ok, err = do_load_module(host, name);
+	local ok, err = do_load_module(host, name, saved or true);
 	if ok then
 		mod = get_module(host, name);
 		if module_has_method(mod, "restore") then
@@ -242,7 +248,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,19 +263,38 @@ 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)
 	return modulemap[host] and modulemap[host][name];
 end
 
+function get_items(key, host)
+	local result = {};
+	local modules = modulemap[host];
+	if not key or not host or not modules then return nil; end
+
+	for _, module in pairs(modules) do
+		local mod = module.module;
+		if mod.items and mod.items[key] then
+			for _, value in ipairs(mod.items[key]) do
+				t_insert(result, value);
+			end
+		end
+	end
+
+	return result;
+end
+
 function get_modules(host)
 	return modulemap[host];
 end