Automated merge with http://waqas.ath.cx:8000/

[prosody.git] / core / componentmanager.lua

diff --git a/core/componentmanager.lua b/core/componentmanager.lua
index 72cdda142cc0d54f9138b63658a68d399f29ea35..0c33e7f69b63f77d8ca799c74ccb406d40d66393 100644 (file)
--- a/core/componentmanager.lua
+++ b/core/componentmanager.lua
@@ -21,13 +21,43 @@
 \r
 \r
 local log = require "util.logger".init("componentmanager");
-local module_load = require "core.modulemanager".load;\r
+local configmanager = require "core.configmanager";
+local eventmanager = require "core.eventmanager";
+local modulemanager = require "core.modulemanager";\r
 local jid_split = require "util.jid".split;\r
-local hosts = hosts;\r
+local hosts = hosts;
+
+local pairs, type, tostring = pairs, type, tostring;\r
 \r
 local components = {};\r
 \r
 module "componentmanager"\r
+
+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 = true, s2sout = {} };
+                       modulemanager.load(host, "dialback");
+                       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);
+                       end
+                       
+                       local ok, component_handler = modulemanager.call_module_method(modulemanager.get_module(host, host_config.core.component_module), "load_component");
+                       if not ok then
+                               log("error", "Error loading %s component %s: %s", tostring(host_config.core.component_module), tostring(host), tostring(component_handler));
+                       else
+                               components[host] = component_handler;
+                       end
+               end
+       end
+end
+
+eventmanager.add_event_hook("server-starting", load_enabled_components);
 \r
 function handle_stanza(origin, stanza)\r
        local node, host = jid_split(stanza.attr.to);\r
@@ -49,12 +79,24 @@ function register_component(host, component)
                components[host] = component;\r
                hosts[host] = { type = "component", host = host, connected = true, s2sout = {} };
                -- FIXME only load for a.b.c if b.c has dialback, and/or check in config
-               module_load(host, "dialback");\r
+               modulemanager.load(host, "dialback");\r
                log("debug", "component added: "..host);\r
                return hosts[host];\r
        else\r
                log("error", "Attempt to set component for existing host: "..host);\r
        end\r
 end\r
+
+function deregister_component(host)
+       if components[host] then
+               modulemanager.unload(host, "dialback");
+               components[host] = nil;
+               hosts[host] = nil;
+               log("debug", "component removed: "..host);
+               return true;
+       else
+               log("error", "Attempt to remove component for non-existing host: "..host);
+       end
+end
 \r
 return _M;\r