Comparison

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
comparison
equal deleted inserted replaced
3009:06f7d8054065 3043:1fadbb2e3ca0
31 _G.log = logger.init("general"); 31 _G.log = logger.init("general");
32 32
33 module "loggingmanager" 33 module "loggingmanager"
34 34
35 -- The log config used if none specified in the config file 35 -- The log config used if none specified in the config file
36 local default_logging = { { to = "console" } }; 36 local default_logging = { { to = "console" , levels = { min = (debug_mode and "debug") or "info" } } };
37 local default_file_logging = { { to = "file", levels = { min = (debug_mode and "debug") or "info" }, timestamps = true } }; 37 local default_file_logging = { { to = "file", levels = { min = (debug_mode and "debug") or "info" }, timestamps = true } };
38 local default_timestamp = "%b %d %H:%M:%S"; 38 local default_timestamp = "%b %d %H:%M:%S";
39 -- The actual config loggingmanager is using 39 -- The actual config loggingmanager is using
40 local logging_config = config.get("*", "core", "log") or default_logging; 40 local logging_config = config.get("*", "core", "log") or default_logging;
41 41