Software /
code /
prosody
Diff
core/loggingmanager.lua @ 3043:1fadbb2e3ca0
Merge with 0.6
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Mon, 17 May 2010 11:56:36 +0100 |
parent | 2925:692b3c6c5bd2 |
parent | 3018:d7c80d23ed21 |
child | 3044:a6f89c72d305 |
line wrap: on
line diff
--- a/core/loggingmanager.lua Wed May 05 17:21:50 2010 +0100 +++ b/core/loggingmanager.lua Mon May 17 11:56:36 2010 +0100 @@ -33,7 +33,7 @@ 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