X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fcomponentmanager.lua;h=d76b78495ad092010e034d75002b6fb50bd3e62d;hb=34215744d79b2fcf146b69a59007d104085dff4a;hp=5efb1f5175b650e1d2d16a1fa5f5799a4c44165c;hpb=0d848174c9fe3e9d6bf7b6a76532ff98f84883e2;p=prosody.git

diff --git a/core/componentmanager.lua b/core/componentmanager.lua
index 5efb1f51..d76b7849 100644
--- a/core/componentmanager.lua
+++ b/core/componentmanager.lua
@@ -13,7 +13,9 @@ 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 st = require "util.stanza";
 local hosts = hosts;
 
 local pairs, type, tostring = pairs, type, tostring;
@@ -31,14 +33,18 @@ require "core.discomanager".addDiscoItemsHandler("*host", function(reply, to, fr
 	end
 end);
 
+require "core.eventmanager".add_event_hook("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();
 		
@@ -50,7 +56,7 @@ function load_enabled_components(config)
 			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
@@ -65,7 +71,7 @@ function handle_stanza(origin, stanza)
 	if not component then component = components[node.."@"..host]; end -- hack to allow hooking node@server
 	if not component then component = components[host]; 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);
@@ -73,9 +79,8 @@ function handle_stanza(origin, stanza)
 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 = {} };
 end
 
 function register_component(host, component, session)
@@ -98,13 +103,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