Merge with waqas

[prosody.git] / core / hostmanager.lua

diff --git a/core/hostmanager.lua b/core/hostmanager.lua
index 1fec97999d1dcadb868558726d552bd61efd9737..ba363273f90c8ad3d1b1216017aab4a63fe11b0a 100644 (file)
--- a/core/hostmanager.lua
+++ b/core/hostmanager.lua
@@ -1,7 +1,16 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local hosts = hosts;
 local configmanager = require "core.configmanager";
 local eventmanager = require "core.eventmanager";
+local events_new = require "util.events".new;
 
 local log = require "util.logger".init("hostmanager");
 
@@ -9,6 +18,8 @@ local pairs = pairs;
 
 module "hostmanager"
 
+local hosts_loaded_once;
+
 local function load_enabled_hosts(config)
        local defined_hosts = config or configmanager.getconfig();
        
@@ -18,13 +29,24 @@ local function load_enabled_hosts(config)
                end
        end
        eventmanager.fire_event("hosts-activated", defined_hosts);
+       hosts_loaded_once = true;
 end
 
 eventmanager.add_event_hook("server-starting", load_enabled_hosts);
 
 function activate(host, host_config)
-       hosts[host] = {type = "local", connected = true, sessions = {}, host = host, s2sout = {} };
-       log("info", "Activated host: %s", host);
+       hosts[host] = {type = "local", connected = true, sessions = {}, 
+                      host = host, s2sout = {}, events = events_new(), 
+                      disallow_s2s = configmanager.get(host, "core", "disallow_s2s") 
+                        or (configmanager.get(host, "core", "anonymous_login") 
+                            and (configmanager.get(host, "core", "disallow_s2s") ~= false))
+                     };
+       for option_name in pairs(host_config.core) do
+               if option_name:match("_ports$") then
+                       log("warn", "%s: Option '%s' has no effect for virtual hosts - put it in global Host \"*\" instead", host, option_name);
+               end
+       end
+       log((hosts_loaded_once and "info") or "debug", "Activated host: %s", host);
        eventmanager.fire_event("host-activated", host, host_config);
 end