Sat, 20 Jun 2009 01:05:06 +0500
Merge with trunk
--- a/core/loggingmanager.lua Sun Jun 14 21:06:43 2009 +0500 +++ b/core/loggingmanager.lua Sat Jun 20 01:05:06 2009 +0500 @@ -12,6 +12,7 @@ local config = require "core.configmanager"; local eventmanager = require "core.eventmanager"; local logger = require "util.logger"; +local debug_mode = config.get("*", "core", "debug"); _G.log = logger.init("general"); @@ -19,7 +20,7 @@ -- The log config used if none specified in the config file local default_logging = { { to = "console" } }; -local default_file_logging = { { to = "file", levels = { min = "info" } } }; +local default_file_logging = { { to = "file", levels = { min = (debug_mode and "debug") or "info" }, timestamps = true } }; local default_timestamp = "%b %d %T"; -- The actual config loggingmanager is using local logging_config = config.get("*", "core", "log") or default_logging;