modulemanager: Allow setting priority of stanza handlers

[prosody.git] / core / componentmanager.lua

diff --git a/core/componentmanager.lua b/core/componentmanager.lua
index 8b1cce3af218eeb8d259b94e49db52d7140f798b..fe4a699962c105c6dba76c66447eb478f84d3de5 100644 (file)
--- a/core/componentmanager.lua
+++ b/core/componentmanager.lua
@@ -15,6 +15,7 @@ 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 events_new = require "util.events".new;
 local st = require "util.stanza";
 local hosts = hosts;
 
@@ -44,19 +45,19 @@ local function default_component_handler(origin, stanza)
        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 = {} };
+                       hosts[host] = { type = "component", host = host, connected = false, s2sout = {}, events = events_new() };
                        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
@@ -67,9 +68,10 @@ eventmanager.add_event_hook("server-starting", load_enabled_components);
 function handle_stanza(origin, stanza)
        local node, host = jid_split(stanza.attr.to);
        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
-       if not component then component = components[host]; end
+       if host then
+               if node then component = components[node.."@"..host]; end -- hack to allow hooking node@server
+               if not component then component = components[host]; end
+       end
        if component then
                log("debug", "%s stanza being handled by component: %s", stanza.name, host);
                component(origin, stanza, hosts[host]);
@@ -80,13 +82,21 @@ end
 
 function create_component(host, component)
        -- TODO check for host well-formedness
-       return { type = "component", host = host, connected = true, s2sout = {} };
+       return { type = "component", host = host, connected = true, s2sout = {}, events = events_new() };
 end
 
 function register_component(host, component, session)
        if not hosts[host] or (hosts[host].type == 'component' and not hosts[host].connected) then
+               local old_events = hosts[host] and hosts[host].events;
+
                components[host] = component;
                hosts[host] = session or create_component(host, component);
+               
+               -- Add events object if not already one
+               if not hosts[host].events then
+                       hosts[host].events = old_events or events_new();
+               end
+               
                -- add to disco_items
                if not(host:find("@", 1, true) or host:find("/", 1, true)) and host:find(".", 1, true) then
                        disco_items:set(host:sub(host:find(".", 1, true)+1), host, true);