aboutsummaryrefslogtreecommitdiffstats
path: root/core/loggingmanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-01-21 14:02:56 +0000
committerMatthew Wild <mwild1@gmail.com>2011-01-21 14:02:56 +0000
commit3dda2fcfac6774f42c10338bfc2362ad666b9c5b (patch)
tree23a32d78c0d79b7870e1a87f0e6350716c7ba6e0 /core/loggingmanager.lua
parentc6d7c5abfd104bdccf535c312ba7c4eb12679de4 (diff)
parent75862530f265ec9fdc58f7937d90367d252ce74a (diff)
downloadprosody-3dda2fcfac6774f42c10338bfc2362ad666b9c5b.tar.gz
prosody-3dda2fcfac6774f42c10338bfc2362ad666b9c5b.zip
Merge 0.8->trunk
Diffstat (limited to 'core/loggingmanager.lua')
-rw-r--r--core/loggingmanager.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index 0e0ae862..b637058c 100644
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -27,8 +27,6 @@ local config = require "core.configmanager";
local logger = require "util.logger";
local prosody = prosody;
-local debug_mode = config.get("*", "core", "debug");
-
_G.log = logger.init("general");
module "loggingmanager"
@@ -166,6 +164,8 @@ function reload_logging()
logger.reset();
+ local debug_mode = config.get("*", "core", "debug");
+
default_logging = { { to = "console" , levels = { min = (debug_mode and "debug") or "info" } } };
default_file_logging = {
{ to = "file", levels = { min = (debug_mode and "debug") or "info" }, timestamps = true }
@@ -195,7 +195,7 @@ end
-- Column width for "source" (used by stdout and console)
local sourcewidth = 20;
-function log_sink_types.stdout()
+function log_sink_types.stdout(config)
local timestamps = config.timestamps;
if timestamps == true then