Mercurial > prosody-hg
comparison core/loggingmanager.lua @ 7132:3868d231c2c5
loggingmanager: Don't reset default timestamp that is not changed by any other code
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 04 Feb 2016 16:56:05 +0100 |
| parents | 631c47a65519 |
| children | ac142f5209d9 |
comparison
equal
deleted
inserted
replaced
| 7131:ea3eea291321 | 7132:3868d231c2c5 |
|---|---|
| 152 | 152 |
| 153 default_logging = { { to = "console" , levels = { min = (debug_mode and "debug") or "info" } } }; | 153 default_logging = { { to = "console" , levels = { min = (debug_mode and "debug") or "info" } } }; |
| 154 default_file_logging = { | 154 default_file_logging = { |
| 155 { to = "file", levels = { min = (debug_mode and "debug") or "info" }, timestamps = true } | 155 { to = "file", levels = { min = (debug_mode and "debug") or "info" }, timestamps = true } |
| 156 }; | 156 }; |
| 157 default_timestamp = "%b %d %H:%M:%S"; | |
| 158 | 157 |
| 159 logging_config = config.get("*", "log") or default_logging; | 158 logging_config = config.get("*", "log") or default_logging; |
| 160 | 159 |
| 161 for name, sink_maker in pairs(old_sink_types) do | 160 for name, sink_maker in pairs(old_sink_types) do |
| 162 log_sink_types[name] = sink_maker; | 161 log_sink_types[name] = sink_maker; |
