aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2009-06-20 01:05:06 +0500
committerWaqas Hussain <waqas20@gmail.com>2009-06-20 01:05:06 +0500
commit0405ab8738672fb4b23de8231cd49934e8d95ffa (patch)
tree80cd71c2f420a09d436a4a4fc4b188737d66f74c
parent547e4f28d6924fdcd93604d3ffc00eade82ed97e (diff)
parentbb37f89796fc8c74870e5a0bc1a4ae079e1419a5 (diff)
downloadprosody-0405ab8738672fb4b23de8231cd49934e8d95ffa.tar.gz
prosody-0405ab8738672fb4b23de8231cd49934e8d95ffa.zip
Merge with trunk
-rw-r--r--core/loggingmanager.lua3
-rw-r--r--core/s2smanager.lua2
2 files changed, 4 insertions, 1 deletions
diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index aa8f368d..2be21a17 100644
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -12,6 +12,7 @@ local getstyle, getstring = require "util.termcolours".getstyle, require "util.t
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 @@ module "loggingmanager"
-- 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 --git a/core/s2smanager.lua b/core/s2smanager.lua
index b8faf712..879084d8 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -379,6 +379,8 @@ function mark_connected(session)
end
session.sendq = nil;
end
+
+ session.srv_hosts = nil;
end
end