Merge 0.9->0.10

[prosody.git] / core / hostmanager.lua

diff --git a/core/hostmanager.lua b/core/hostmanager.lua
index 7edf823013ec932188641d70ac9fff153edcb92c..7f9d1610f0a9a80e96a7dc2cb2f35d08aa8add79 100644 (file)
--- a/core/hostmanager.lua
+++ b/core/hostmanager.lua
@@ -1,7 +1,7 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -13,18 +13,18 @@ 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");
 
-local hosts = hosts;
+local hosts = prosody.hosts;
 local prosody_events = prosody.events;
 if not _G.prosody.incoming_s2s then
        require "core.s2smanager";
 end
 local incoming_s2s = _G.prosody.incoming_s2s;
+local core_route_stanza = _G.prosody.core_route_stanza;
 
-local pairs, setmetatable = pairs, setmetatable;
+local pairs, select, rawget = pairs, select, rawget;
 local tostring, type = tostring, type;
 
 module "hostmanager"
@@ -34,20 +34,20 @@ local hosts_loaded_once;
 local function load_enabled_hosts(config)
        local defined_hosts = config or configmanager.getconfig();
        local activated_any_host;
-       
+
        for host, host_config in pairs(defined_hosts) do
-               if host ~= "*" and host_config.core.enabled ~= false then
-                       if not host_config.core.component_module then
+               if host ~= "*" and host_config.enabled ~= false then
+                       if not host_config.component_module then
                                activated_any_host = true;
                        end
                        activate(host, host_config);
                end
        end
-       
+
        if not activated_any_host then
                log("error", "No active VirtualHost entries in the config file. This may cause unexpected behaviour as no modules will be loaded.");
        end
-       
+
        prosody_events.fire_event("hosts-activated", defined_hosts);
        hosts_loaded_once = true;
 end
@@ -66,18 +66,17 @@ local function host_send(stanza)
 end
 
 function activate(host, host_config)
-       if hosts[host] then return nil, "The host "..host.." is already activated"; end
+       if rawget(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;
+               modules = {};
        };
-       if not host_config.core.component_module then -- host
+       if not host_config.component_module then -- host
                host_session.type = "local";
                host_session.sessions = {};
        else -- component
@@ -85,16 +84,16 @@ function activate(host, host_config)
        end
        hosts[host] = host_session;
        if not host:match("[@/]") then
-               disco_items:set(host:match("%.(.*)") or "*", host, true);
+               disco_items:set(host:match("%.(.*)") or "*", host, host_config.name or true);
        end
-       for option_name in pairs(host_config.core) do
+       for option_name in pairs(host_config) 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);
                end
        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
 
@@ -102,13 +101,14 @@ 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 });
+
        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
@@ -133,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);