X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fcomponentmanager.lua;h=536d16339e247c539c74978743476d08b29e4e37;hb=d6ac47c50ec04d29c21929db2468d093d58083a3;hp=8f624f1590b232b0ca7fdc99fdcf86d3f98e5649;hpb=6347b731867cdecabecb23a936308c26992d686f;p=prosody.git

diff --git a/core/componentmanager.lua b/core/componentmanager.lua
index 8f624f15..536d1633 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
 -- 
@@ -6,18 +6,16 @@
 -- COPYING file in the source package for more information.
 --
 
-
-
-
+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;
 
@@ -25,16 +23,8 @@ local components = {};
 
 local disco_items = require "util.multitable".new();
 local NULL = {};
-require "core.discomanager".addDiscoItemsHandler("*host", function(reply, to, from, node)
-	if #node == 0 and hosts[to] then
-		for jid in pairs(disco_items:get(to) or NULL) do
-			reply:tag("item", {jid = jid}):up();
-		end
-		return true;
-	end
-end);
 
-require "core.eventmanager".add_event_hook("server-starting", function () core_route_stanza = _G.core_route_stanza; end);
+prosody.events.add_handler("server-starting", function () core_route_stanza = _G.core_route_stanza; end);
 
 module "componentmanager"
 
@@ -51,7 +41,7 @@ function load_enabled_components(config)
 		
 	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
@@ -63,7 +53,7 @@ function load_enabled_components(config)
 	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);
@@ -76,7 +66,7 @@ function handle_stanza(origin, stanza)
 		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
 
@@ -87,12 +77,14 @@ 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 = events_new();
+			hosts[host].events = old_events or events_new();
 		end
 		
 		-- add to disco_items
@@ -136,4 +128,8 @@ function set_component_handler(host, handler)
 	components[host] = handler;
 end
 
+function get_children(host)
+	return disco_items:get(host) or NULL;
+end
+
 return _M;