diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2010-05-06 17:14:11 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2010-05-06 17:14:11 +0500 |
| commit | cd44ab86cdaff0a39119a9e750f74bb172972475 (patch) | |
| tree | 606859b5659d850d800c566536e6a38cc5bafe66 | |
| parent | 6c0bf0ebbeedf0d1a186b6bd178731d00671200f (diff) | |
| parent | 9c6d61718a10ced453e73639566785ae292b0b47 (diff) | |
| download | prosody-cd44ab86cdaff0a39119a9e750f74bb172972475.tar.gz prosody-cd44ab86cdaff0a39119a9e750f74bb172972475.zip | |
Merge 0.7->trunk
| -rw-r--r-- | core/loggingmanager.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua index a088a3f3..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" , 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 |