diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/moduleapi.lua | 4 | ||||
| -rw-r--r-- | core/s2smanager.lua | 2 | ||||
| -rw-r--r-- | core/sessionmanager.lua | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/core/moduleapi.lua b/core/moduleapi.lua index 24d29dfe..572dc179 100644 --- a/core/moduleapi.lua +++ b/core/moduleapi.lua @@ -14,8 +14,6 @@ local logger = require "util.logger"; local pluginloader = require "util.pluginloader"; local timer = require "util.timer"; -local multitable_new = require "util.multitable".new; - local t_insert, t_remove, t_concat = table.insert, table.remove, table.concat; local error, setmetatable, setfenv, type = error, setmetatable, setfenv, type; local ipairs, pairs, select, unpack = ipairs, pairs, select, unpack; @@ -339,4 +337,4 @@ function api:load_resource(path, mode) return io.open(path, mode); end -return api; +return api;
\ No newline at end of file diff --git a/core/s2smanager.lua b/core/s2smanager.lua index 9e0a91d1..5fe3a375 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -133,7 +133,7 @@ local resting_session = { -- Resting, not dead function retire_session(session, reason) local log = session.log or log; for k in pairs(session) do - if k ~= "trace" and k ~= "log" and k ~= "id" then + if k ~= "trace" and k ~= "log" and k ~= "id" and k ~= "conn" then session[k] = nil; end end diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index 37c1626a..131c29f7 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -82,7 +82,7 @@ function retire_session(session) end end - function session.send(data) log("debug", "Discarding data sent to resting session: %s", tostring(data)); end + function session.send(data) log("debug", "Discarding data sent to resting session: %s", tostring(data)); return false; end function session.data(data) log("debug", "Discarding data received from resting session: %s", tostring(data)); end return setmetatable(session, resting_session); end |