util.pluginloader: Return full file path from internal file loader on success, not...

[prosody.git] / util / logger.lua

diff --git a/util/logger.lua b/util/logger.lua
index fd5d3d805b7120533e87f282ffe4ba6020d7fd08..c3bf399266703a6832e30ed14c6ab42183052c4e 100644 (file)
--- a/util/logger.lua
+++ b/util/logger.lua
@@ -1,23 +1,105 @@
+-- Prosody IM
+-- 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.
+--
+
+local pcall = pcall;
+
+local find = string.find;
+local ipairs, pairs, setmetatable = ipairs, pairs, setmetatable;
 
-local format = string.format;
-local print = print;
-local debug = debug;
-local tostring = tostring;
 module "logger"
 
+local name_sinks, level_sinks = {}, {};
+local name_patterns = {};
+
+local make_logger;
+
 function init(name)
+       local log_debug = make_logger(name, "debug");
+       local log_info = make_logger(name, "info");
+       local log_warn = make_logger(name, "warn");
+       local log_error = make_logger(name, "error");
+
        --name = nil; -- While this line is not commented, will automatically fill in file/line number info
-       return  function (level, message, ...)
-                               if not name then
-                                       local inf = debug.getinfo(3, 'Snl');
-                                       level = level .. ","..tostring(inf.short_src):match("[^/]*$")..":"..inf.currentline;
-                               end
-                               if ... then 
-                                       print(name, level, format(message, ...));
-                               else
-                                       print(name, level, message);
+       local namelen = #name;
+       return function (level, message, ...)
+                       if level == "debug" then
+                               return log_debug(message, ...);
+                       elseif level == "info" then
+                               return log_info(message, ...);
+                       elseif level == "warn" then
+                               return log_warn(message, ...);
+                       elseif level == "error" then
+                               return log_error(message, ...);
+                       end
+               end
+end
+
+function make_logger(source_name, level)
+       local level_handlers = level_sinks[level];
+       if not level_handlers then
+               level_handlers = {};
+               level_sinks[level] = level_handlers;
+       end
+
+       local source_handlers = name_sinks[source_name];
+       
+       local logger = function (message, ...)
+               if source_handlers then
+                       for i = 1,#source_handlers do
+                               if source_handlers[i](source_name, level, message, ...) == false then
+                                       return;
                                end
                        end
+               end
+               
+               for i = 1,#level_handlers do
+                       level_handlers[i](source_name, level, message, ...);
+               end
+       end
+
+       return logger;
+end
+
+function reset()
+       for k in pairs(name_sinks) do name_sinks[k] = nil; end
+       for level, handler_list in pairs(level_sinks) do
+               -- Clear all handlers for this level
+               for i = 1, #handler_list do
+                       handler_list[i] = nil;
+               end
+       end
+       for k in pairs(name_patterns) do name_patterns[k] = nil; end
+end
+
+function add_level_sink(level, sink_function)
+       if not level_sinks[level] then
+               level_sinks[level] = { sink_function };
+       else
+               level_sinks[level][#level_sinks[level] + 1 ] = sink_function;
+       end
 end
 
-return _M;
\ No newline at end of file
+function add_name_sink(name, sink_function, exclusive)
+       if not name_sinks[name] then
+               name_sinks[name] = { sink_function };
+       else
+               name_sinks[name][#name_sinks[name] + 1] = sink_function;
+       end
+end
+
+function add_name_pattern_sink(name_pattern, sink_function, exclusive)
+       if not name_patterns[name_pattern] then
+               name_patterns[name_pattern] = { sink_function };
+       else
+               name_patterns[name_pattern][#name_patterns[name_pattern] + 1] = sink_function;
+       end
+end
+
+_M.new = make_logger;
+
+return _M;