aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-01 02:38:05 +0100
committerKim Alvefur <zash@zash.se>2017-03-01 02:38:05 +0100
commita11a584a59cde70ce4f0880049b9e675d8b2e223 (patch)
tree9e8179e3cdc021aa83812cf4bbdb4fd0d9cbc814 /tests
parent93f4c5076db39f3cc14bb2ad989ade760da0f107 (diff)
parent4de415d6700cd0f1ab4111cdf4c5f5cb7161c766 (diff)
downloadprosody-a11a584a59cde70ce4f0880049b9e675d8b2e223.tar.gz
prosody-a11a584a59cde70ce4f0880049b9e675d8b2e223.zip
Merge 0.10->trunk
Diffstat (limited to 'tests')
-rw-r--r--tests/util/logger.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/util/logger.lua b/tests/util/logger.lua
index c133e332..44860d5d 100644
--- a/tests/util/logger.lua
+++ b/tests/util/logger.lua
@@ -14,7 +14,8 @@ local tostring = tostring;
local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring;
local do_pretty_printing = not os.getenv("WINDIR");
-module "logger"
+local _ENV = nil
+local _M = {}
local logstyles = {};
@@ -25,7 +26,7 @@ if do_pretty_printing then
logstyles["error"] = getstyle("bold", "red");
end
-function init(name)
+function _M.init(name)
--name = nil; -- While this line is not commented, will automatically fill in file/line number info
return function (level, message, ...)
if level == "debug" or level == "info" then return; end