# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1245429121 -3600
# Node ID 4eccafa3609f6b88608c7909589e935132c9380a
# Parent  35b5686d73ea27412942f52263a6bb5550a1b055# Parent  e34f9455b7799dc49de1e953d55b21426079d64e
Merge with waqas via albert!

diff -r e34f9455b779 -r 4eccafa3609f core/loggingmanager.lua
--- a/core/loggingmanager.lua	Sat Jun 13 00:07:16 2009 +0500
+++ b/core/loggingmanager.lua	Fri Jun 19 17:32:01 2009 +0100
@@ -12,6 +12,7 @@
 local config = require "core.configmanager";
 local eventmanager = require "core.eventmanager";
 local logger = require "util.logger";
+local debug_mode = config.get("*", "core", "debug");
 
 _G.log = logger.init("general");
 
@@ -19,7 +20,7 @@
 
 -- The log config used if none specified in the config file
 local default_logging = { { to = "console" } };
-local default_file_logging = { { to = "file", levels = { min = "info" } } };
+local default_file_logging = { { to = "file", levels = { min = (debug_mode and "debug") or "info" }, timestamps = true } };
 local default_timestamp = "%b %d %T";
 -- The actual config loggingmanager is using
 local logging_config = config.get("*", "core", "log") or default_logging;
diff -r e34f9455b779 -r 4eccafa3609f core/s2smanager.lua
--- a/core/s2smanager.lua	Sat Jun 13 00:07:16 2009 +0500
+++ b/core/s2smanager.lua	Fri Jun 19 17:32:01 2009 +0100
@@ -379,6 +379,8 @@
 			end
 			session.sendq = nil;
 		end
+		
+		session.srv_hosts = nil;
 	end
 end