Software / code / prosody
Changeset
1025:efd71cae24ea
Merge with 0.4.1
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 21 Apr 2009 21:11:12 +0100 |
| parents | 1023:c0a3ef0a1f34 (current diff) 1024:1bcc8ca57a7c (diff) |
| children | 1034:2b0aba0bb013 |
| files | |
| diffstat | 1 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/core/loggingmanager.lua Wed Apr 22 00:49:45 2009 +0500 +++ b/core/loggingmanager.lua Tue Apr 21 21:11:12 2009 +0100 @@ -8,12 +8,15 @@ local logger = require "util.logger"; +local default_logging = { { to = "console" } }; + -- Global log function, because some people are too -- lazy to get their own... _G.log = logger.init("general"); local log_sink_types = {}; local get_levels; +local logging_levels = { "debug", "info", "warn", "error", "critical" } --- Main function to read config, create the appropriate sinks and tell logger module function setup_logging(log) @@ -47,7 +50,14 @@ end end); else - -- All sources + -- All sources + -- Create sink + local sink = sink_maker(sink_config); + + -- Set sink for all levels + for _, level in pairs(logging_levels) do + logger.add_level_sink(level, sink); + end end else -- No such sink type @@ -129,8 +139,6 @@ end --- Helper function to get a set of levels given a "criteria" table -local logging_levels = { "debug", "info", "warn", "error", "critical" } - function get_levels(criteria, set) set = set or {}; if type(criteria) == "string" then
