aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-07-25 16:57:22 +0100
committerMatthew Wild <mwild1@gmail.com>2012-07-25 16:57:22 +0100
commitcbe9fe6825f043a5c399f37158fd6e85c90c8992 (patch)
treeb44ec7d6df03312ef28ebdde6c6966e0840f2901
parent372049e1141baf204af3d719ad38ff5bcd71a53d (diff)
parenta9b451200578c00115686b2db7e41ef09e622115 (diff)
downloadprosody-cbe9fe6825f043a5c399f37158fd6e85c90c8992.tar.gz
prosody-cbe9fe6825f043a5c399f37158fd6e85c90c8992.zip
Merge with IRON
-rw-r--r--core/loggingmanager.lua10
1 files changed, 4 insertions, 6 deletions
diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index 56a3ee2c..ce25b0e8 100644
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -7,14 +7,12 @@
--
-local format, rep = string.format, string.rep;
-local pcall = pcall;
-local debug = debug;
-local tostring, setmetatable, rawset, pairs, ipairs, type =
- tostring, setmetatable, rawset, pairs, ipairs, type;
+local format = string.format;
+local setmetatable, rawset, pairs, ipairs, type =
+ 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 os_date = os.date;
local getstyle, setstyle = require "util.termcolours".getstyle, require "util.termcolours".setstyle;
if os.getenv("__FLUSH_LOG") then