diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-03-22 17:26:12 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-03-22 17:26:12 +0000 |
| commit | e9210ce2e777ed966cc4e80df96582e84d0d2ae8 (patch) | |
| tree | 9a36c6329eb70d4e655dc88742cea8419f06f9c3 /core/loggingmanager.lua | |
| parent | 2c597f0fa443131956fd7e9d3ad86774f1dd7c7b (diff) | |
| parent | 46c0b8c7f9adeeef3e0a22204879d82230ce3d5b (diff) | |
| download | prosody-e9210ce2e777ed966cc4e80df96582e84d0d2ae8.tar.gz prosody-e9210ce2e777ed966cc4e80df96582e84d0d2ae8.zip | |
Merge 0.7->trunk
Diffstat (limited to 'core/loggingmanager.lua')
| -rw-r--r-- | core/loggingmanager.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua index 1bf90db1..b329bf11 100644 --- a/core/loggingmanager.lua +++ b/core/loggingmanager.lua @@ -1,6 +1,6 @@ -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. @@ -35,7 +35,7 @@ module "loggingmanager" -- The log config used if none specified in the config file local default_logging = { { to = "console" } }; local default_file_logging = { { to = "file", levels = { min = (debug_mode and "debug") or "info" }, timestamps = true } }; -local default_timestamp = "%b %d %T"; +local default_timestamp = "%b %d %H:%M:%S"; -- The actual config loggingmanager is using local logging_config = config.get("*", "core", "log") or default_logging; |