Software / code / prosody
Changeset
3514:fdae08713c67
core.loggingmanager: Logging config simplification - allow [level] = filename and *sink to appear in the config table
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 08 Oct 2010 02:48:47 +0100 |
| parents | 3513:4cf5962747fc |
| children | 3515:bb494c3aa364 |
| files | core/loggingmanager.lua |
| diffstat | 1 files changed, 20 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/core/loggingmanager.lua Wed Oct 06 00:13:24 2010 +0100 +++ b/core/loggingmanager.lua Fri Oct 08 02:48:47 2010 +0100 @@ -89,9 +89,25 @@ -- the log_sink_types table. function apply_sink_rules(sink_type) if type(logging_config) == "table" then + + if sink_type == "file" then + for _, level in ipairs(logging_levels) do + if type(logging_config[level]) == "string" then + add_rule({ + to = "file", + filename = logging_config[level], + timestamps = true, + levels = { min = level }, + }); + end + end + end + for _, sink_config in pairs(logging_config) do - if sink_config.to == sink_type then + if (type(sink_config) == "table" and sink_config.to == sink_type) then add_rule(sink_config); + elseif (type(sink_config) == "string" and sink_config:match("^%*(.+)") == sink_type) then + add_rule({ levels = { min = "debug" }, to = sink_type }); end end elseif type(logging_config) == "string" and (not logging_config:match("^%*")) and sink_type == "file" then @@ -151,7 +167,9 @@ logger.reset(); default_logging = { { to = "console" , levels = { min = (debug_mode and "debug") or "info" } } }; - default_file_logging = { { to = "file", levels = { min = (debug_mode and "debug") or "info" }, timestamps = true } }; + default_file_logging = { + { to = "file", levels = { min = (debug_mode and "debug") or "info" }, timestamps = true } + }; default_timestamp = "%b %d %H:%M:%S"; logging_config = config.get("*", "core", "log") or default_logging;
