Automated merge with http://waqas.ath.cx:8000/

[prosody.git] / util / logger.lua

diff --git a/util/logger.lua b/util/logger.lua
index e9440a04f2ee9dfba4a13ed89dd7aef2fdc343ca..5115bbdaaeadc545fe2b2ef0a93b4e205911e721 100644 (file)
--- a/util/logger.lua
+++ b/util/logger.lua
@@ -1,8 +1,28 @@
+-- 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.
+--
 
-local format = string.format;
-local print = print;
+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");
@@ -18,19 +38,37 @@ if do_pretty_printing then
        logstyles["error"] = getstyle("bold", "red");
 end
 
+local sourcewidth = 20;
+
+local outfunction = nil;
+
 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 
-                                       print(name, getstring(logstyles[level], level), format(message, ...));
+                                       io_write(name, rep(" ", sourcewidth-namelen), getstring(logstyles[level], level), "\t", format(message, ...), "\n");
                                else
-                                       print(name, getstring(logstyles[level], level), message);
+                                       io_write(name, rep(" ", sourcewidth-namelen), getstring(logstyles[level], level), "\t", message, "\n");
                                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;
+       end
+       return ok, ret;
+end
+
 return _M;