# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1228595151 0
# Node ID 81e68e5afce29685322c6c7aae2ece6aab27c238
# Parent  22f54a04471f883e64d5f7ed0b83b580439b063c# Parent  5879264e28e2d1f6bef29a1933a99e8773d8712f
Merge from waqas

diff -r 5879264e28e2 -r 81e68e5afce2 core/hostmanager.lua
--- a/core/hostmanager.lua	Sun Dec 07 01:06:10 2008 +0500
+++ b/core/hostmanager.lua	Sat Dec 06 20:25:51 2008 +0000
@@ -1,10 +1,10 @@
-
-hosts = {};
 
 local hosts = hosts;
 local configmanager = require "core.configmanager";
 local eventmanager = require "core.eventmanager";
 
+local log = require "util.logger".init("hostmanager");
+
 local pairs = pairs;
 
 module "hostmanager"
@@ -23,13 +23,13 @@
 
 function activate(host, host_config)
 	hosts[host] = {type = "local", connected = true, sessions = {}, host = host, s2sout = {} };
-	
+	log("info", "Activated host: %s", host);
 	eventmanager.fire_event("host-activated", host, host_config);
 end
 
 function deactivate(host)
 	local host_session = hosts[host];
-	
+	log("info", "Deactivating host: %s", host);
 	eventmanager.fire_event("host-deactivating", host, host_session);
 	
 	-- Disconnect local users, s2s connections
@@ -42,6 +42,7 @@
 	
 	hosts[host] = nil;
 	eventmanager.fire_event("host-deactivated", host);
+	log("info", "Deactivated host: %s", host);
 end
 
 function getconfig(name)
diff -r 5879264e28e2 -r 81e68e5afce2 core/modulemanager.lua
--- a/core/modulemanager.lua	Sun Dec 07 01:06:10 2008 +0500
+++ b/core/modulemanager.lua	Sat Dec 06 20:25:51 2008 +0000
@@ -224,7 +224,7 @@
 	end);
 end
 
-api.add_event_hook = eventmanager.add_event_hook;
+function api:add_event_hook (...) return eventmanager.add_event_hook(...); end
 
 local function __add_handler(module, origin_type, tag, xmlns, handler)
 	local handlers = stanza_handlers[module.host];
diff -r 5879264e28e2 -r 81e68e5afce2 prosody
--- a/prosody	Sun Dec 07 01:06:10 2008 +0500
+++ b/prosody	Sat Dec 06 20:25:51 2008 +0000
@@ -68,8 +68,6 @@
 	end
 end
 
-require "util.datamanager".set_data_path(data_path);
-
 local server = require "net.server"
 
 require "util.dependencies"
@@ -78,7 +76,6 @@
 sessions = {};
 hosts = {};
 
-
 -- Load and initialise core modules --
 
 require "util.import"
@@ -104,9 +101,13 @@
 
 ------------------------------------------------------------------------
 
+
 ------------- Begin code without a home ---------------------
 
 local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
+require "util.datamanager".set_data_path(data_path);
+
+
 local path_separator = "/"; if os.getenv("WINDIR") then path_separator = "\\" end
 local _mkdir = {}
 function mkdir(path)
diff -r 5879264e28e2 -r 81e68e5afce2 util/datamanager.lua
--- a/util/datamanager.lua	Sun Dec 07 01:06:10 2008 +0500
+++ b/util/datamanager.lua	Sat Dec 06 20:25:51 2008 +0000
@@ -52,6 +52,7 @@
 
 local data_path = "data";
 function set_data_path(path)
+	log("info", "Setting data path to %s", path);
 	data_path = path;
 end