core.configmanager: Make components use 'component' module by default if none specified

[prosody.git] / util / logger.lua

diff --git a/util/logger.lua b/util/logger.lua
index f93cafc12d2cdab559e57a1931d7a864ecddfade..fab9e4c39652e28ce0bd62e8fab2aa486c34feeb 100644 (file)
--- a/util/logger.lua
+++ b/util/logger.lua
@@ -1,11 +1,25 @@
+-- Prosody IM v0.4
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
 
-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 config = require "core.configmanager";
+local log_sources = config.get("*", "core", "log_sources");
 
 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 = ipairs;
 
 module "logger"
 
@@ -18,19 +32,46 @@ if do_pretty_printing then
        logstyles["error"] = getstyle("bold", "red");
 end
 
+local sourcewidth = 20;
+
+local outfunction = nil;
+
 function init(name)
+       if log_sources then
+               local log_this = false;
+               for _, source in ipairs(log_sources) do
+                       if find(name, source) then 
+                               log_this = true;
+                               break;
+                       end
+               end
+               
+               if not log_this then return function () end end
+       end
+       
        --name = nil; -- While this line is not commented, will automatically fill in file/line number info
+       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
+                               
+                               sourcewidth = math_max(#name+2, sourcewidth);
                                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
 
-return _M;
\ No newline at end of file
+function setwriter(f)
+       local old_func = outfunction;
+       if not f then outfunction = nil; return true, old_func; end
+       local ok, ret = pcall(f, "logger", "info", "Switched logging output successfully");
+       if ok then
+               outfunction = f;
+               ret = old_func;
+       end
+       return ok, ret;
+end
+
+return _M;