mod_storage_sql: Add method for listing stores

[prosody.git] / core / hostmanager.lua

diff --git a/core/hostmanager.lua b/core/hostmanager.lua
index fddf1769d9ebd1773f2640af3cf9ce2a34a62b09..66275d968b80d7d7efaa338eccab5e15f400172f 100644 (file)
--- a/core/hostmanager.lua
+++ b/core/hostmanager.lua
@@ -12,6 +12,7 @@ local events_new = require "util.events".new;
 local disco_items = require "util.multitable".new();
 local NULL = {};
 
+local jid_split = require "util.jid".split;
 local uuid_gen = require "util.uuid".generate;
 
 local log = require "util.logger".init("hostmanager");
@@ -23,7 +24,8 @@ if not _G.prosody.incoming_s2s then
 end
 local incoming_s2s = _G.prosody.incoming_s2s;
 
-local pairs, setmetatable = pairs, setmetatable;
+local pairs, select = pairs, select;
+local tostring, type = tostring, type;
 
 module "hostmanager"
 
@@ -52,22 +54,31 @@ end
 
 prosody_events.add_handler("server-starting", load_enabled_hosts);
 
+local function host_send(stanza)
+       local name, type = stanza.name, stanza.attr.type;
+       if type == "error" or (name == "iq" and type == "result") then
+               local dest_host_name = select(2, jid_split(stanza.attr.to));
+               local dest_host = hosts[dest_host_name] or { type = "unknown" };
+               log("warn", "Unhandled response sent to %s host %s: %s", dest_host.type, dest_host_name, tostring(stanza));
+               return;
+       end
+       core_route_stanza(nil, stanza);
+end
+
 function activate(host, host_config)
-       if hosts[host] then return nil, "host-already-exists"; end
+       if hosts[host] then return nil, "The host "..host.." is already activated"; end
        host_config = host_config or configmanager.getconfig()[host];
+       if not host_config then return nil, "Couldn't find the host "..tostring(host).." defined in the current config"; end
        local host_session = {
                host = host;
                s2sout = {};
                events = events_new();
                dialback_secret = configmanager.get(host, "core", "dialback_secret") or uuid_gen();
-               disallow_s2s = configmanager.get(host, "core", "disallow_s2s");
+               send = host_send;
        };
        if not host_config.core.component_module then -- host
                host_session.type = "local";
                host_session.sessions = {};
-               if configmanager.get(host, "core", "anonymous_login") then
-                       host_session.disallow_s2s = (configmanager.get(host, "core", "disallow_s2s") ~= false);
-               end
        else -- component
                host_session.type = "component";
        end
@@ -82,18 +93,22 @@ function activate(host, host_config)
        end
        
        log((hosts_loaded_once and "info") or "debug", "Activated host: %s", host);
-       prosody_events.fire_event("host-activated", host, host_config);
+       prosody_events.fire_event("host-activated", host);
        return true;
 end
 
 function deactivate(host, reason)
        local host_session = hosts[host];
+       if not host_session then return nil, "The host "..tostring(host).." is not activated"; end
        log("info", "Deactivating host: %s", host);
-       prosody_events.fire_event("host-deactivating", host, host_session);
+       prosody_events.fire_event("host-deactivating", { host = host, host_session = host_session, reason = reason });
        
-       reason = reason or { condition = "host-gone", text = "This server has stopped serving "..host };
+       if type(reason) ~= "table" then
+               reason = { condition = "host-gone", text = tostring(reason or "This server has stopped serving "..host) };
+       end
        
        -- Disconnect local users, s2s connections
+       -- TODO: These should move to mod_c2s and mod_s2s (how do they know they're being unloaded and not reloaded?)
        if host_session.sessions then
                for username, user in pairs(host_session.sessions) do
                        for resource, session in pairs(user.sessions) do
@@ -118,6 +133,7 @@ function deactivate(host, reason)
                end
        end
 
+       -- TODO: This should be done in modulemanager
        if host_session.modules then
                for module in pairs(host_session.modules) do
                        modulemanager.unload(host, module);
@@ -130,6 +146,7 @@ function deactivate(host, reason)
        end
        prosody_events.fire_event("host-deactivated", host);
        log("info", "Deactivated host: %s", host);
+       return true;
 end
 
 function get_children(host)