aboutsummaryrefslogtreecommitdiffstats
path: root/core/loggingmanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-05-17 11:56:36 +0100
committerMatthew Wild <mwild1@gmail.com>2010-05-17 11:56:36 +0100
commit93fbb53acdb0e7ecd7d8745ca514417b3fde1e6f (patch)
tree49f2b6ce22e89b3107d09da8b238acebc9c11045 /core/loggingmanager.lua
parent4af6813db9ffa6dcacd2eb20417ca4667159f9af (diff)
parent95e01d796f994eb9ffcb902b38dd1c17ca7c4c57 (diff)
downloadprosody-93fbb53acdb0e7ecd7d8745ca514417b3fde1e6f.tar.gz
prosody-93fbb53acdb0e7ecd7d8745ca514417b3fde1e6f.zip
Merge with 0.6
Diffstat (limited to 'core/loggingmanager.lua')
-rw-r--r--core/loggingmanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index b329bf11..3ec696d5 100644
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -33,7 +33,7 @@ _G.log = logger.init("general");
module "loggingmanager"
-- The log config used if none specified in the config file
-local default_logging = { { to = "console" } };
+local default_logging = { { to = "console" , levels = { min = (debug_mode and "debug") or "info" } } };
local default_file_logging = { { to = "file", levels = { min = (debug_mode and "debug") or "info" }, timestamps = true } };
local default_timestamp = "%b %d %H:%M:%S";
-- The actual config loggingmanager is using