Mercurial > prosody-hg
diff core/loggingmanager.lua @ 2925:692b3c6c5bd2
Merge 0.6->0.7
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 22 Mar 2010 17:24:55 +0000 |
| parents | 26ead5e16cd3 b7049746bd29 |
| children | abd1a30330e0 31cda82337dc 1fadbb2e3ca0 |
line wrap: on
line diff
--- a/core/loggingmanager.lua Mon Mar 22 15:05:05 2010 +0000 +++ b/core/loggingmanager.lua Mon Mar 22 17:24:55 2010 +0000 @@ -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 @@ -- 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;