Fix for not loading global modules when host-specific modules are specified in config

[prosody.git] / core / componentmanager.lua

diff --git a/core/componentmanager.lua b/core/componentmanager.lua
index 18bf5c02a6a5e2017a0793185f688632c00add83..a63cfd7abee186cb8513c9ccd93432e9efe89735 100644 (file)
--- a/core/componentmanager.lua
+++ b/core/componentmanager.lua
@@ -1,6 +1,27 @@
+-- Prosody IM v0.2
+-- Copyright (C) 2008 Matthew Wild
+-- Copyright (C) 2008 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.
+--
+
+
 \r
 \r
-local log = require "util.logger".init("componentmanager")\r
+local log = require "util.logger".init("componentmanager");
+local module_load = require "core.modulemanager".load;\r
 local jid_split = require "util.jid".split;\r
 local hosts = hosts;\r
 \r
@@ -15,7 +36,7 @@ function handle_stanza(origin, stanza)
        if not component then component = components[stanza.attr.to]; end -- hack to allow hooking node@server/resource and server/resource\r
        if component then\r
                log("debug", "stanza being handled by component: "..host);\r
-               component(origin, stanza);\r
+               component(origin, stanza, hosts[host]);\r
        else\r
                log("error", "Component manager recieved a stanza for a non-existing component: " .. stanza.attr.to);\r
        end\r
@@ -25,11 +46,14 @@ function register_component(host, component)
        if not hosts[host] then\r
                -- TODO check for host well-formedness\r
                components[host] = component;\r
-               hosts[host] = {type = "component", connected = true};\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
                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
 \r
-return _M;
\ No newline at end of file
+return _M;\r