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;
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)
- origin.send(st.error_reply(stanza, "wait", "service-unavailable", "Component unavailable"));
+ 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
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);
end
function create_component(host, component)
- -- TODO check for host well-formedness
- local session = session or { type = "component", host = host, connected = true, s2sout = {}, send = component };
- return session;
+ -- TODO check for host well-formedness
+ local session = session or { type = "component", host = host, connected = true, s2sout = {} };
+ return session;
end
function register_component(host, component, session)
function deregister_component(host)
if components[host] then
modulemanager.unload(host, "dialback");
- components[host] = nil;
- local host_config = defined_hosts[host];
- if ((host_config.core.enabled == nil or host_config.core.enabled) and type(host_config.core.component_module) == "string") then
+ 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