Merge 0.7->trunk
authorWaqas Hussain <waqas20@gmail.com>
Thu, 06 May 2010 17:14:11 +0500
changeset 3020 4164023a2258
parent 3016 b6046df19898 (current diff)
parent 3019 6b2e4b581717 (diff)
child 3021 bf3c4195c5f8
Merge 0.7->trunk
core/loggingmanager.lua
--- 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