aboutsummaryrefslogtreecommitdiffstats
path: root/core/loggingmanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-07-28 19:17:09 +0100
committerMatthew Wild <mwild1@gmail.com>2009-07-28 19:17:09 +0100
commit5dfe9cf891dc5becd805dfbad79653d9eb840001 (patch)
treef64c675fbbac1f4acbcc959d820ddba16fd57a06 /core/loggingmanager.lua
parent39e1b4b1df2c49739e89b80f4b4351a4e6b20f81 (diff)
parent8ad65c2824d2ee3bd52175df34fdd7bd9d393231 (diff)
downloadprosody-5dfe9cf891dc5becd805dfbad79653d9eb840001.tar.gz
prosody-5dfe9cf891dc5becd805dfbad79653d9eb840001.zip
Merge with 0.5
Diffstat (limited to 'core/loggingmanager.lua')
-rw-r--r--core/loggingmanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index 1d2f8d7d..d701511e 100644
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -222,7 +222,7 @@ function log_sink_types.file(config)
local timestamps = config.timestamps;
- if timestamps == true then
+ if timestamps == nil or timestamps == true then
timestamps = default_timestamp; -- Default format
end