X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fcomponentmanager.lua;h=08868236e76a8c7f1ef36f1c6897947bed020c85;hb=ba596f33614438d0f42713ca39423bdc88eb224d;hp=5efb1f5175b650e1d2d16a1fa5f5799a4c44165c;hpb=6c9a6fec45a868c3de602bdadf7be895e1d4d101;p=prosody.git

diff --git a/core/componentmanager.lua b/core/componentmanager.lua
index 5efb1f51..08868236 100644
--- a/core/componentmanager.lua
+++ b/core/componentmanager.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.4
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -8,13 +8,16 @@
 
 
 
-
+local prosody = prosody;
 local log = require "util.logger".init("componentmanager");
 local configmanager = require "core.configmanager";
-local eventmanager = require "core.eventmanager";
 local modulemanager = require "core.modulemanager";
+local core_route_stanza = core_route_stanza;
 local jid_split = require "util.jid".split;
+local events_new = require "util.events".new;
+local st = require "util.stanza";
 local hosts = hosts;
+local serialize = require "util.serialization".serialize
 
 local pairs, type, tostring = pairs, type, tostring;
 
@@ -31,57 +34,69 @@ require "core.discomanager".addDiscoItemsHandler("*host", function(reply, to, fr
 	end
 end);
 
+prosody.events.add_handler("server-starting", function () core_route_stanza = _G.core_route_stanza; end);
 
 module "componentmanager"
 
 local function default_component_handler(origin, stanza)
-	origin.send(st.error_reply(stanza, "wait", "service-unavailable", "Component unavailable"));
+	log("warn", "Stanza being handled by default component, bouncing error");
+	if stanza.attr.type ~= "error" then
+		core_route_stanza(nil, st.error_reply(stanza, "wait", "service-unavailable", "Component unavailable"));
+	end
 end
 
-
+local components_loaded_once;
 function load_enabled_components(config)
 	local defined_hosts = config or configmanager.getconfig();
 		
 	for host, host_config in pairs(defined_hosts) do
 		if host ~= "*" and ((host_config.core.enabled == nil or host_config.core.enabled) and type(host_config.core.component_module) == "string") then
-			hosts[host] = { type = "component", host = host, connected = false, s2sout = {} };
+			hosts[host] = { type = "component", host = host, connected = false, s2sout = {}, events = events_new() };
 			components[host] = default_component_handler;
 			local ok, err = modulemanager.load(host, host_config.core.component_module);
 			if not ok then
 				log("error", "Error loading %s component %s: %s", tostring(host_config.core.component_module), tostring(host), tostring(err));
 			else
-				log("info", "Activated %s component: %s", host_config.core.component_module, host);
+				log("debug", "Activated %s component: %s", host_config.core.component_module, host);
 			end
 		end
 	end
 end
 
-eventmanager.add_event_hook("server-starting", load_enabled_components);
+prosody.events.add_handler("server-starting", load_enabled_components);
 
 function handle_stanza(origin, stanza)
 	local node, host = jid_split(stanza.attr.to);
 	local component = nil;
-	if not component then component = components[stanza.attr.to]; end -- hack to allow hooking node@server/resource and server/resource
-	if not component then component = components[node.."@"..host]; end -- hack to allow hooking node@server
-	if not component then component = components[host]; end
+	if host then
+		if node then component = components[node.."@"..host]; end -- hack to allow hooking node@server
+		if not component then component = components[host]; end
+	end
 	if component then
-		log("debug", "stanza being handled by component: "..host);
+		log("debug", "%s stanza being handled by component: %s", stanza.name, host);
 		component(origin, stanza, hosts[host]);
 	else
-		log("error", "Component manager recieved a stanza for a non-existing component: " .. stanza.attr.to);
+		log("error", "Component manager recieved a stanza for a non-existing component: " .. (stanza.attr.to or serialize(stanza)));
 	end
 end
 
 function create_component(host, component)
-		-- TODO check for host well-formedness
-		local session = session or { type = "component", host = host, connected = true, s2sout = {}, send = component };
-		return session;
+	-- TODO check for host well-formedness
+	return { type = "component", host = host, connected = true, s2sout = {}, events = events_new() };
 end
 
 function register_component(host, component, session)
 	if not hosts[host] or (hosts[host].type == 'component' and not hosts[host].connected) then
+		local old_events = hosts[host] and hosts[host].events;
+
 		components[host] = component;
 		hosts[host] = session or create_component(host, component);
+		
+		-- Add events object if not already one
+		if not hosts[host].events then
+			hosts[host].events = old_events or events_new();
+		end
+		
 		-- add to disco_items
 		if not(host:find("@", 1, true) or host:find("/", 1, true)) and host:find(".", 1, true) then
 			disco_items:set(host:sub(host:find(".", 1, true)+1), host, true);
@@ -98,13 +113,15 @@ end
 function deregister_component(host)
 	if components[host] then
 		modulemanager.unload(host, "dialback");
-		components[host] = nil;
-		local host_config = defined_hosts[host];
-		if ((host_config.core.enabled == nil or host_config.core.enabled) and type(host_config.core.component_module) == "string") then
+		hosts[host].connected = nil;
+		local host_config = configmanager.getconfig()[host];
+		if host_config and ((host_config.core.enabled == nil or host_config.core.enabled) and type(host_config.core.component_module) == "string") then
 			-- Set default handler
+			components[host] = default_component_handler;
 		else
 			-- Component not in config, or disabled, remove
 			hosts[host] = nil;
+			components[host] = nil;
 		end
 		-- remove from disco_items
 		if not(host:find("@", 1, true) or host:find("/", 1, true)) and host:find(".", 1, true) then