diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2010-12-15 01:57:10 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2010-12-15 01:57:10 +0500 |
| commit | 2cbe4b74e3ff3e5588617558570288921b9a5ef8 (patch) | |
| tree | edd085d923cbb6ed0e0a53070f32297f7c3a9e30 | |
| parent | a0f4376c7803b5fc4d4fc99e431ac97067d628a7 (diff) | |
| download | prosody-2cbe4b74e3ff3e5588617558570288921b9a5ef8.tar.gz prosody-2cbe4b74e3ff3e5588617558570288921b9a5ef8.zip | |
core.loggingmanager: Updated to use termcolours.getstyle instead of termcolours.getstring for console logging.
| -rw-r--r-- | core/loggingmanager.lua | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua index 3cd09431..40b96d52 100644 --- a/core/loggingmanager.lua +++ b/core/loggingmanager.lua @@ -15,7 +15,7 @@ local tostring, setmetatable, rawset, pairs, ipairs, type = local io_open, io_write = io.open, io.write; local math_max, rep = math.max, string.rep; local os_date, os_getenv = os.date, os.getenv; -local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring; +local getstyle, setstyle = require "util.termcolours".getstyle, require "util.termcolours".setstyle; if os.getenv("__FLUSH_LOG") then local io_flush = io.flush; @@ -217,7 +217,7 @@ function log_sink_types.stdout() end do - local do_pretty_printing = not os_getenv("WINDIR"); + local do_pretty_printing = true; local logstyles = {}; if do_pretty_printing then @@ -244,10 +244,14 @@ do if timestamps then io_write(os_date(timestamps), " "); end + io_write(name, rep(" ", sourcewidth-namelen)); + setstyle(logstyles[level]); + io_write(level); + setstyle(); if ... then - io_write(name, rep(" ", sourcewidth-namelen), getstring(logstyles[level], level), "\t", format(message, ...), "\n"); + io_write("\t", format(message, ...), "\n"); else - io_write(name, rep(" ", sourcewidth-namelen), getstring(logstyles[level], level), "\t", message, "\n"); + io_write("\t", message, "\n"); end end end |