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 f7ea187b04efb22db94e3120c0d18506bee664d9..fab9e4c39652e28ce0bd62e8fab2aa486c34feeb 100644 (file)
--- a/util/logger.lua
+++ b/util/logger.lua
@@ -1,20 +1,9 @@
--- Prosody IM v0.1
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM v0.4
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 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.
+-- 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;
@@ -24,8 +13,13 @@ 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"
 
@@ -43,17 +37,24 @@ 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
-       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
                                
+                               sourcewidth = math_max(#name+2, sourcewidth);
                                if ... then 
                                        io_write(name, rep(" ", sourcewidth-namelen), getstring(logstyles[level], level), "\t", format(message, ...), "\n");
                                else
@@ -63,10 +64,12 @@ function init(name)
 end
 
 function setwriter(f)
-       if not f then outfunction = nil; return true, nil; end
+       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