mod_component: Remove unused variable

[prosody.git] / core / loggingmanager.lua

diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index 460afeaf9ce77d8ec264cd06f5ee83b633c08fb7..56a3ee2c10640dd53eb2591ff04c6fbc0bcb18e8 100644 (file)
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -41,41 +41,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
@@ -88,20 +66,26 @@ end
 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
+               for _, level in ipairs(logging_levels) do
+                       if type(logging_config[level]) == "string" then
+                               local value = logging_config[level];
+                               if sink_type == "file" then
+                                       add_rule({
+                                               to = sink_type;
+                                               filename = value;
+                                               timestamps = true;
+                                               levels = { min = level };
+                                       });
+                               elseif value == "*"..sink_type then
                                        add_rule({
-                                               to = "file",
-                                               filename = logging_config[level],
-                                               timestamps = true,
-                                               levels = { min = level },
+                                               to = sink_type;
+                                               levels = { min = level };
                                        });
                                end
                        end
                end
                
-               for _, sink_config in pairs(logging_config) do
+               for _, sink_config in ipairs(logging_config) do
                        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
@@ -195,7 +179,7 @@ end
 -- Column width for "source" (used by stdout and console)
 local sourcewidth = 20;
 
-function log_sink_types.stdout()
+function log_sink_types.stdout(config)
        local timestamps = config.timestamps;
        
        if timestamps == true then