Stopped using presencemanager in stanza_router

[prosody.git] / core / componentmanager.lua

diff --git a/core/componentmanager.lua b/core/componentmanager.lua
index feae96dcb3163812fde7f827588d67cc14283593..308dea57f030b65f19675c3a41ae4d020cf33005 100644 (file)
--- a/core/componentmanager.lua
+++ b/core/componentmanager.lua
@@ -13,6 +13,7 @@ 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;
@@ -32,13 +33,14 @@ 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)
        log("warn", "Stanza being handled by default component, bouncing error");
        if stanza.attr.type ~= "error" then
-               origin.send(st.error_reply(stanza, "wait", "service-unavailable", "Component unavailable"));
+               core_route_stanza(nil, st.error_reply(stanza, "wait", "service-unavailable", "Component unavailable"));
        end
 end
 
@@ -78,7 +80,7 @@ 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 };
+       local session = session or { type = "component", host = host, connected = true, s2sout = {} };
        return session;
 end
 
@@ -102,13 +104,14 @@ 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
+               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