# HG changeset patch
# User Waqas Hussain <waqas20@gmail.com>
# Date 1245441906 -18000
# Node ID 75c39ac6efa042ecb142bd8db9c6e6704e2d385d
# Parent  4e56889c33e12d07d91c275f65b948219146ec5d# Parent  4eccafa3609f6b88608c7909589e935132c9380a
Merge with trunk

diff -r 4e56889c33e1 -r 75c39ac6efa0 core/loggingmanager.lua
--- a/core/loggingmanager.lua	Sun Jun 14 21:06:43 2009 +0500
+++ b/core/loggingmanager.lua	Sat Jun 20 01:05:06 2009 +0500
@@ -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 4e56889c33e1 -r 75c39ac6efa0 core/s2smanager.lua
--- a/core/s2smanager.lua	Sun Jun 14 21:06:43 2009 +0500
+++ b/core/s2smanager.lua	Sat Jun 20 01:05:06 2009 +0500
@@ -379,6 +379,8 @@
 			end
 			session.sendq = nil;
 		end
+		
+		session.srv_hosts = nil;
 	end
 end