Software /
code /
prosody
Diff
core/s2smanager.lua @ 5453:116971a751d3
Merge 0.9->trunk
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Mon, 08 Apr 2013 17:22:15 +0100 |
parent | 5447:92b88476873a |
child | 5459:3a821511b9ec |
line wrap: on
line diff
--- a/core/s2smanager.lua Mon Apr 08 15:32:51 2013 +0100 +++ b/core/s2smanager.lua Mon Apr 08 17:22:15 2013 +0100 @@ -24,15 +24,8 @@ 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 @@ 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