Software / code / prosody
Changeset
961:b48ed2149d0a
componentmanager: Reply with service-unavailable for unconnected components
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 08 Apr 2009 11:21:21 +0100 |
| parents | 960:6bc16062da6c |
| children | 962:872f5d85636e |
| files | core/componentmanager.lua |
| diffstat | 1 files changed, 17 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/core/componentmanager.lua Mon Apr 06 23:43:48 2009 +0100 +++ b/core/componentmanager.lua Wed Apr 08 11:21:21 2009 +0100 @@ -34,12 +34,18 @@ module "componentmanager" +local function default_component_handler(origin, stanza) + origin.send(st.error_reply(stanza, "wait", "service-unavailable", "Component unavailable")); +end + + 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 = {} }; + 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)); @@ -93,7 +99,13 @@ if components[host] then modulemanager.unload(host, "dialback"); components[host] = nil; - hosts[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 + -- Set default handler + else + -- Component not in config, or disabled, remove + hosts[host] = nil; + end -- remove from disco_items if not(host:find("@", 1, true) or host:find("/", 1, true)) and host:find(".", 1, true) then disco_items:remove(host:sub(host:find(".", 1, true)+1), host); @@ -105,4 +117,8 @@ end end +function set_component_handler(host, handler) + components[host] = handler; +end + return _M;
