aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2010-12-15 01:57:10 +0500
committerWaqas Hussain <waqas20@gmail.com>2010-12-15 01:57:10 +0500
commitec51542c8f50154e19d4eeff79059be1d33f9305 (patch)
tree1d02d9aa27ed81c445cdb8b29aa8a5d0edf2a81d
parent9610cf338eb615e9b7b495818e0901c38dd99ff7 (diff)
downloadprosody-ec51542c8f50154e19d4eeff79059be1d33f9305.tar.gz
prosody-ec51542c8f50154e19d4eeff79059be1d33f9305.zip
core.loggingmanager: Updated to use termcolours.getstyle instead of termcolours.getstring for console logging.
-rw-r--r--core/loggingmanager.lua12
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