diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-04-08 17:22:15 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-04-08 17:22:15 +0100 |
commit | 22baeb39fe3c291e7f98977b7fa6af8353d910dd (patch) | |
tree | b63f60f6dff8c647f5952a2a92bb0a1da8d2a94f /core/sessionmanager.lua | |
parent | 4f4ea37379152abaee179a750a24f7019c405583 (diff) | |
parent | 0ce5c766ac0a68a167a9fa26b931c56d35ae785b (diff) | |
download | prosody-22baeb39fe3c291e7f98977b7fa6af8353d910dd.tar.gz prosody-22baeb39fe3c291e7f98977b7fa6af8353d910dd.zip |
Merge 0.9->trunk
Diffstat (limited to 'core/sessionmanager.lua')
-rw-r--r-- | core/sessionmanager.lua | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index e721835d..d178fb2d 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -29,17 +29,8 @@ local getmetatable = getmetatable; module "sessionmanager" -local open_sessions = 0; - function new_session(conn) local session = { conn = conn, type = "c2s_unauthed", conntime = gettime() }; - if true then - session.trace = newproxy(true); - getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; end; - end - open_sessions = open_sessions + 1; - log("debug", "open sessions now: %d", open_sessions); - local filter = initialize_filters(session); local w = conn.write; session.send = function (t) @@ -72,7 +63,7 @@ local resting_session = { -- Resting, not dead function retire_session(session) local log = session.log or log; for k in pairs(session) do - if k ~= "trace" and k ~= "log" and k ~= "id" then + if k ~= "log" and k ~= "id" then session[k] = nil; end end |