aboutsummaryrefslogtreecommitdiffstats
path: root/core/sessionmanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-05-06 19:26:53 +0100
committerMatthew Wild <mwild1@gmail.com>2015-05-06 19:26:53 +0100
commitdaec51c435ca77914271200607841d55ff7408d7 (patch)
tree15f1682fbc9c2ea904651bcc59e99d2397b0d4a8 /core/sessionmanager.lua
parentba96c2f7db5ce079d7609dff90591b9872ba6143 (diff)
parenta540d613cd08b8feee096d19b727d1f5b2cab507 (diff)
downloadprosody-daec51c435ca77914271200607841d55ff7408d7.tar.gz
prosody-daec51c435ca77914271200607841d55ff7408d7.zip
Merge 0.10->trunk
Diffstat (limited to 'core/sessionmanager.lua')
-rw-r--r--core/sessionmanager.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index d833dbe5..5e4e2991 100644
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -54,11 +54,11 @@ local resting_session = { -- Resting, not dead
close = function (session)
session.log("debug", "Attempt to close already-closed session");
end;
- filter = function (type, data) return data; end;
+ filter = function (type, data) return data; end; --luacheck: ignore 212/type
}; resting_session.__index = resting_session;
function retire_session(session)
- local log = session.log or log;
+ local log = session.log or log; --luacheck: ignore 431/log
for k in pairs(session) do
if k ~= "log" and k ~= "id" then
session[k] = nil;