diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/componentmanager.lua | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/core/componentmanager.lua b/core/componentmanager.lua index 0d61bbb1..04909a07 100644 --- a/core/componentmanager.lua +++ b/core/componentmanager.lua @@ -27,21 +27,13 @@ function load_enabled_components(config) 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"); + hosts[host] = { type = "component", host = host, connected = false, s2sout = {} }; 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 @@ -63,7 +55,7 @@ function handle_stanza(origin, stanza) end
function register_component(host, component)
- if not hosts[host] then
+ if not hosts[host] or (hosts[host].type == 'component' and not hosts[host].connected) then
-- TODO check for host well-formedness
components[host] = component;
hosts[host] = { type = "component", host = host, connected = true, s2sout = {} }; |