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/s2smanager.lua | |
| parent | 4f4ea37379152abaee179a750a24f7019c405583 (diff) | |
| parent | 0ce5c766ac0a68a167a9fa26b931c56d35ae785b (diff) | |
| download | prosody-22baeb39fe3c291e7f98977b7fa6af8353d910dd.tar.gz prosody-22baeb39fe3c291e7f98977b7fa6af8353d910dd.zip | |
Merge 0.9->trunk
Diffstat (limited to 'core/s2smanager.lua')
| -rw-r--r-- | core/s2smanager.lua | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua index 5777cb8e..e4de498a 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -24,15 +24,8 @@ local fire_event = prosody.events.fire_event; module "s2smanager" -local open_sessions = 0; - function new_incoming(conn) local session = { conn = conn, type = "s2sin_unauthed", direction = "incoming", hosts = {} }; - if true then - session.trace = newproxy(true); - getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; end; - end - open_sessions = open_sessions + 1; session.log = logger_init("s2sin"..tostring(session):match("[a-f0-9]+$")); incoming_s2s[session] = true; return session; @@ -62,7 +55,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" and k ~= "conn" then + if k ~= "log" and k ~= "id" and k ~= "conn" then session[k] = nil; end end |