diff options
| author | Kim Alvefur <zash@zash.se> | 2013-03-23 04:17:39 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-03-23 04:17:39 +0100 |
| commit | 983891c9fa8e728aa4680aedc74ec50a0329346e (patch) | |
| tree | fc52870bbca26966e739b1654dd7ff728fbbd9e0 /core/loggingmanager.lua | |
| parent | 4adcfb2d185bb95ec430822c772f091b713faa7a (diff) | |
| parent | 869da6c240dccfed8c43228ceb989af5faf6c8f1 (diff) | |
| download | prosody-983891c9fa8e728aa4680aedc74ec50a0329346e.tar.gz prosody-983891c9fa8e728aa4680aedc74ec50a0329346e.zip | |
Merge 0.9->trunk
Diffstat (limited to 'core/loggingmanager.lua')
| -rw-r--r-- | core/loggingmanager.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua index c3fc83e4..c69dede8 100644 --- a/core/loggingmanager.lua +++ b/core/loggingmanager.lua @@ -146,7 +146,7 @@ function reload_logging() logger.reset(); - local debug_mode = config.get("*", "core", "debug"); + local debug_mode = config.get("*", "debug"); default_logging = { { to = "console" , levels = { min = (debug_mode and "debug") or "info" } } }; default_file_logging = { @@ -154,7 +154,7 @@ function reload_logging() }; default_timestamp = "%b %d %H:%M:%S"; - logging_config = config.get("*", "core", "log") or default_logging; + logging_config = config.get("*", "log") or default_logging; for name, sink_maker in pairs(old_sink_types) do |