Merge 0.9->0.10

[prosody.git] / util / logger.lua

diff --git a/util/logger.lua b/util/logger.lua
index 4fadb4b9beaec0175d3189086242a8faac74e2fd..3d1f1c8bffc7c7aa971c63db10feda513819e5d2 100644 (file)
--- a/util/logger.lua
+++ b/util/logger.lua
@@ -1,7 +1,7 @@
 -- 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.
 --
@@ -11,20 +11,18 @@ local pcall = pcall;
 local find = string.find;
 local ipairs, pairs, setmetatable = ipairs, pairs, setmetatable;
 
-module "logger"
+local _ENV = nil;
 
 local level_sinks = {};
 
 local make_logger;
 
-function init(name)
+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");
 
-       --name = nil; -- While this line is not commented, will automatically fill in file/line number info
-       local namelen = #name;
        return function (level, message, ...)
                        if level == "debug" then
                                return log_debug(message, ...);
@@ -54,7 +52,7 @@ function make_logger(source_name, level)
        return logger;
 end
 
-function reset()
+local function reset()
        for level, handler_list in pairs(level_sinks) do
                -- Clear all handlers for this level
                for i = 1, #handler_list do
@@ -63,7 +61,7 @@ function reset()
        end
 end
 
-function add_level_sink(level, sink_function)
+local function add_level_sink(level, sink_function)
        if not level_sinks[level] then
                level_sinks[level] = { sink_function };
        else
@@ -71,6 +69,10 @@ function add_level_sink(level, sink_function)
        end
 end
 
-_M.new = make_logger;
-
-return _M;
+return {
+       init = init;
+       make_logger = make_logger;
+       reset = reset;
+       add_level_sink = add_level_sink;
+       new = make_logger;
+};