Update Makefile to set correct paths on install with Debian package

[prosody.git] / util / logger.lua

diff --git a/util/logger.lua b/util/logger.lua
index 623ceb674abf8d054de14d0e850f880a426e04a5..24950400b01e96c4470a7e5739f809bd15144688 100644 (file)
--- a/util/logger.lua
+++ b/util/logger.lua
@@ -1,23 +1,42 @@
 
-local format = string.format;
+local format, rep = string.format, string.rep;
+local io_write = io.write;
 local print = print;
 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");
+
 module "logger"
 
+local logstyles = {};
+
+--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");
+end
+
+local sourcewidth = 20;
+
 function init(name)
-       name = nil; -- While this line is not commented, will automatically fill in file/line number info
+       --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 ... then 
-                                       print(level, format(message, ...));
+                                       io_write(name, rep(" ", sourcewidth-namelen), getstring(logstyles[level], level), "\t", format(message, ...), "\n");
                                else
-                                       print(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
+return _M;