Merge 0.8->trunk

[prosody.git] / core / hostmanager.lua

diff --git a/core/hostmanager.lua b/core/hostmanager.lua
index 71bc723e2b3179e1bdce0aa21326ab300e746566..9e74cd6bb5cdf0f5090381f3ce30bda3321b4df2 100644 (file)
--- a/core/hostmanager.lua
+++ b/core/hostmanager.lua
@@ -9,6 +9,8 @@
 local configmanager = require "core.configmanager";
 local modulemanager = require "core.modulemanager";
 local events_new = require "util.events".new;
+local disco_items = require "util.multitable".new();
+local NULL = {};
 
 local uuid_gen = require "util.uuid".generate;
 
@@ -22,6 +24,7 @@ end
 local incoming_s2s = _G.prosody.incoming_s2s;
 
 local pairs, setmetatable = pairs, setmetatable;
+local tostring, type = tostring, type;
 
 module "hostmanager"
 
@@ -32,8 +35,10 @@ local function load_enabled_hosts(config)
        local activated_any_host;
        
        for host, host_config in pairs(defined_hosts) do
-               if host ~= "*" and host_config.core.enabled ~= false and not host_config.core.component_module then
-                       activated_any_host = true;
+               if host ~= "*" and host_config.core.enabled ~= false then
+                       if not host_config.core.component_module then
+                               activated_any_host = true;
+                       end
                        activate(host, host_config);
                end
        end
@@ -49,6 +54,9 @@ end
 prosody_events.add_handler("server-starting", load_enabled_hosts);
 
 function activate(host, host_config)
+       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 = {};
@@ -59,13 +67,13 @@ function activate(host, host_config)
        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
        hosts[host] = host_session;
+       if not host:match("[@/]") then
+               disco_items:set(host:match("%.(.*)") or "*", host, true);
+       end
        for option_name in pairs(host_config.core) do
                if option_name:match("_ports$") or option_name:match("_interface$") then
                        log("warn", "%s: Option '%s' has no effect for virtual hosts - put it in the server-wide section instead", host, option_name);
@@ -74,14 +82,18 @@ function activate(host, host_config)
        
        log((hosts_loaded_once and "info") or "debug", "Activated host: %s", host);
        prosody_events.fire_event("host-activated", host, host_config);
+       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);
        
-       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
        if host_session.sessions then
@@ -115,11 +127,16 @@ function deactivate(host, reason)
        end
 
        hosts[host] = nil;
+       if not host:match("[@/]") then
+               disco_items:remove(host:match("%.(.*)") or "*", host);
+       end
        prosody_events.fire_event("host-deactivated", host);
        log("info", "Deactivated host: %s", host);
+       return true;
 end
 
-function getconfig(name)
+function get_children(host)
+       return disco_items:get(host) or NULL;
 end
 
 return _M;