diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-05-06 19:26:53 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-05-06 19:26:53 +0100 |
| commit | 125dc63f565a46aedcb1750c45dcc97c71c2c72b (patch) | |
| tree | 15f1682fbc9c2ea904651bcc59e99d2397b0d4a8 /core/s2smanager.lua | |
| parent | 83049e63c621c66da5129449f3a610df2e74ce38 (diff) | |
| parent | ec83b2aa91ab9142ad6e7f4d26b0f6d20853e747 (diff) | |
| download | prosody-125dc63f565a46aedcb1750c45dcc97c71c2c72b.tar.gz prosody-125dc63f565a46aedcb1750c45dcc97c71c2c72b.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core/s2smanager.lua')
| -rw-r--r-- | core/s2smanager.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua index 59c1831b..a3a8702a 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -49,11 +49,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, reason) - 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" and k ~= "conn" then session[k] = nil; |