tools/ejabberd2prosody: Fixed private storage export

[prosody.git] / core / componentmanager.lua

diff --git a/core/componentmanager.lua b/core/componentmanager.lua
index e7b5e4dcaac9bb102ea91eb7b127bcb753ad2d28..d76b78495ad092010e034d75002b6fb50bd3e62d 100644 (file)
--- 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,20 +33,30 @@ 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
+               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 = {} };
+                       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
@@ -59,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);
@@ -67,9 +79,8 @@ function handle_stanza(origin, stanza)
 end
 
 function create_component(host, component)
-               -- TODO check for host well-formedness
-               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)
@@ -92,8 +103,16 @@ end
 function deregister_component(host)
        if components[host] then
                modulemanager.unload(host, "dialback");
-               components[host] = nil;
-               hosts[host] = nil;
+               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
                        disco_items:remove(host:sub(host:find(".", 1, true)+1), host);
@@ -105,4 +124,8 @@ function deregister_component(host)
        end
 end
 
+function set_component_handler(host, handler)
+       components[host] = handler;
+end
+
 return _M;