X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Flogger.lua;h=3d1f1c8bffc7c7aa971c63db10feda513819e5d2;hb=393df1ec3b94bc57f5b30510e9c83000c07f9806;hp=5115bbdaaeadc545fe2b2ef0a93b4e205911e721;hpb=8aba1c77f0714f2460cc21660bb494fc217e042b;p=prosody.git

diff --git a/util/logger.lua b/util/logger.lua
index 5115bbda..3d1f1c8b 100644
--- a/util/logger.lua
+++ b/util/logger.lua
@@ -1,74 +1,78 @@
--- Prosody IM v0.2
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
--- 
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; either version 2
--- of the License, or (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-- 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 format, rep = string.format, string.rep;
-local io_write = io.write;
 local pcall = pcall;
-local debug = debug;
-local tostring = tostring;
-local math_max = math.max;
 
-local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring;
-local do_pretty_printing = not os.getenv("WINDIR");
+local find = string.find;
+local ipairs, pairs, setmetatable = ipairs, pairs, setmetatable;
+
+local _ENV = nil;
+
+local level_sinks = {};
 
-module "logger"
+local make_logger;
 
-local logstyles = {};
+local 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");
 
---TODO: This should be done in config, but we don't have proper config yet
-if do_pretty_printing then
-	logstyles["info"] = getstyle("bold");
-	logstyles["warn"] = getstyle("bold", "yellow");
-	logstyles["error"] = getstyle("bold", "red");
+	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
 
-local sourcewidth = 20;
+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 logger = function (message, ...)
+		for i = 1,#level_handlers do
+			level_handlers[i](source_name, level, message, ...);
+		end
+	end
 
-local outfunction = nil;
+	return logger;
+end
 
-function init(name)
-	--name = nil; -- While this line is not commented, will automatically fill in file/line number info
-	sourcewidth = math_max(#name+2, sourcewidth);
-	local namelen = #name;
-	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 outfunction then return outfunction(name, level, message, ...); end
-				
-				if ... then 
-					io_write(name, rep(" ", sourcewidth-namelen), getstring(logstyles[level], level), "\t", format(message, ...), "\n");
-				else
-					io_write(name, rep(" ", sourcewidth-namelen), getstring(logstyles[level], level), "\t", message, "\n");
-				end
-			end
+local function reset()
+	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
 end
 
-function setwriter(f)
-	if not f then outfunction = nil; return true, nil; end
-	local ok, ret = pcall(f, "logger", "info", "Switched logging output successfully");
-	if ok then
-		outfunction = f;
+local 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
-	return ok, ret;
 end
 
-return _M;
+return {
+	init = init;
+	make_logger = make_logger;
+	reset = reset;
+	add_level_sink = add_level_sink;
+	new = make_logger;
+};