Software /
code /
prosody
Diff
core/loggingmanager.lua @ 3020:4164023a2258
Merge 0.7->trunk
author | Waqas Hussain <waqas20@gmail.com> |
---|---|
date | Thu, 06 May 2010 17:14:11 +0500 |
parent | 2966:e78436234775 |
parent | 3019:6b2e4b581717 |
child | 3045:ff5b3932e5f2 |
line wrap: on
line diff
--- a/core/loggingmanager.lua Thu May 06 15:19:20 2010 +0500 +++ b/core/loggingmanager.lua Thu May 06 17:14:11 2010 +0500 @@ -33,7 +33,7 @@ module "loggingmanager" -- The log config used if none specified in the config file -local default_logging = { { to = "console" , levels = { min = (debug_mode and "debug" ) } } }; +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