diff options
| author | Kim Alvefur <zash@zash.se> | 2017-10-29 02:05:19 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-10-29 02:05:19 +0200 |
| commit | 89526be11ca68bf639927c4ed1bc808bb769f5f5 (patch) | |
| tree | 0d8a66dad4d8c64d5cfab32c11132b2c0e1ca301 /core/loggingmanager.lua | |
| parent | 62eaaff226249e924494f78434c422bd094264c1 (diff) | |
| parent | 63e10c1c271e70eafc4257a54b07178488e33de1 (diff) | |
| download | prosody-89526be11ca68bf639927c4ed1bc808bb769f5f5.tar.gz prosody-89526be11ca68bf639927c4ed1bc808bb769f5f5.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core/loggingmanager.lua')
| -rw-r--r-- | core/loggingmanager.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua index 6dc1c1d1..004f4c3b 100644 --- a/core/loggingmanager.lua +++ b/core/loggingmanager.lua @@ -178,7 +178,7 @@ local function log_to_file(sink_config, logfile) local timestamps = sink_config.timestamps; - if timestamps == true then + if timestamps == true or timestamps == nil then timestamps = default_timestamp; -- Default format elseif timestamps then timestamps = timestamps .. " "; |