modulemanager: Reduce warning to debug level message about modules already being...

[prosody.git] / core / loggingmanager.lua

diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index 88f2bbbf506453d349427e2cb10de667ab2f200f..c69dede85edf747d4c5f935f99fea5b06887d72a 100644 (file)
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -7,14 +7,12 @@
 --
 
 
-local format, rep = string.format, string.rep;
-local pcall = pcall;
-local debug = debug;
-local tostring, setmetatable, rawset, pairs, ipairs, type =
-       tostring, setmetatable, rawset, pairs, ipairs, type;
+local format = string.format;
+local setmetatable, rawset, pairs, ipairs, type =
+       setmetatable, rawset, pairs, ipairs, type;
 local io_open, io_write = io.open, io.write;
 local math_max, rep = math.max, string.rep;
-local os_date, os_getenv = os.date, os.getenv;
+local os_date = os.date;
 local getstyle, setstyle = require "util.termcolours".getstyle, require "util.termcolours".setstyle;
 
 if os.getenv("__FLUSH_LOG") then
@@ -41,41 +39,19 @@ local logging_config;
 local apply_sink_rules;
 local log_sink_types = setmetatable({}, { __newindex = function (t, k, v) rawset(t, k, v); apply_sink_rules(k); end; });
 local get_levels;
-local logging_levels = { "debug", "info", "warn", "error", "critical" }
+local logging_levels = { "debug", "info", "warn", "error" }
 
 -- Put a rule into action. Requires that the sink type has already been registered.
 -- This function is called automatically when a new sink type is added [see apply_sink_rules()]
 local function add_rule(sink_config)
        local sink_maker = log_sink_types[sink_config.to];
        if sink_maker then
-               if sink_config.levels and not sink_config.source then
-                       -- Create sink
-                       local sink = sink_maker(sink_config);
-                       
-                       -- Set sink for all chosen levels
-                       for level in pairs(get_levels(sink_config.levels)) do
-                               logger.add_level_sink(level, sink);
-                       end
-               elseif sink_config.source and not sink_config.levels then
-                       logger.add_name_sink(sink_config.source, sink_maker(sink_config));
-               elseif sink_config.source and sink_config.levels then
-                       local levels = get_levels(sink_config.levels);
-                       local sink = sink_maker(sink_config);
-                       logger.add_name_sink(sink_config.source,
-                               function (name, level, ...)
-                                       if levels[level] then
-                                               return sink(name, level, ...);
-                                       end
-                               end);
-               else
-                       -- 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
+               -- Create sink
+               local sink = sink_maker(sink_config);
+               
+               -- Set sink for all chosen levels
+               for level in pairs(get_levels(sink_config.levels or logging_levels)) do
+                       logger.add_level_sink(level, sink);
                end
        else
                -- No such sink type
@@ -91,7 +67,7 @@ function apply_sink_rules(sink_type)
                for _, level in ipairs(logging_levels) do
                        if type(logging_config[level]) == "string" then
                                local value = logging_config[level];
-                               if sink_type == "file" then
+                               if sink_type == "file" and not value:match("^%*") then
                                        add_rule({
                                                to = sink_type;
                                                filename = value;
@@ -170,7 +146,7 @@ function reload_logging()
        
        logger.reset();
 
-       local debug_mode = config.get("*", "core", "debug");
+       local debug_mode = config.get("*", "debug");
 
        default_logging = { { to = "console" , levels = { min = (debug_mode and "debug") or "info" } } };
        default_file_logging = {
@@ -178,7 +154,7 @@ function reload_logging()
        };
        default_timestamp = "%b %d %H:%M:%S";
 
-       logging_config = config.get("*", "core", "log") or default_logging;
+       logging_config = config.get("*", "log") or default_logging;
        
        
        for name, sink_maker in pairs(old_sink_types) do