Fix for never checking if the first module for a host is already loaded (affects...

[prosody.git] / core / componentmanager.lua

diff --git a/core/componentmanager.lua b/core/componentmanager.lua
index a63cfd7abee186cb8513c9ccd93432e9efe89735..0d61bbb146eac758965090cff5005f8627bce40d 100644 (file)
--- a/core/componentmanager.lua
+++ b/core/componentmanager.lua
@@ -1,39 +1,59 @@
--- Prosody IM v0.2
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM v0.3
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
 -- 
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; either version 2
--- of the License, or (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
 --
 
 
 \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
-       local component = components[host];\r
+       local component = nil;
+       if not component then component = components[stanza.attr.to]; end -- hack to allow hooking node@server/resource and server/resource
        if not component then component = components[node.."@"..host]; end -- hack to allow hooking node@server\r
-       if not component then component = components[stanza.attr.to]; end -- hack to allow hooking node@server/resource and server/resource\r
+       if not component then component = components[host]; end
        if component then\r
                log("debug", "stanza being handled by component: "..host);\r
                component(origin, stanza, hosts[host]);\r
@@ -48,12 +68,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