Software /
code /
prosody
Comparison
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 |
comparison
equal
deleted
inserted
replaced
3016:b6046df19898 | 3020:4164023a2258 |
---|---|
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" , levels = { min = (debug_mode and "debug" ) } } }; | 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 |