Merge with trunk

Sat, 20 Jun 2009 01:05:06 +0500

author
Waqas Hussain <waqas20@gmail.com>
date
Sat, 20 Jun 2009 01:05:06 +0500
changeset 1362
75c39ac6efa0
parent 1361
4e56889c33e1 (current diff)
parent 1347
4eccafa3609f (diff)
child 1363
daa51f48736d
child 1374
e85726d084d6

Merge with trunk

--- 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;
--- 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
 

mercurial