diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-04-08 15:53:18 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-04-08 15:53:18 +0100 |
| commit | 752df97c84549c703b43edaf0f7faefdc4505485 (patch) | |
| tree | c39dbe70b8dd54c45d4c39bd33f9282d7d2ea45e /core | |
| parent | d7dbbc087154aa0dbf338dc7aea0f0ddd38c9e8a (diff) | |
| download | prosody-752df97c84549c703b43edaf0f7faefdc4505485.tar.gz prosody-752df97c84549c703b43edaf0f7faefdc4505485.zip | |
sessionmanager, s2smanager: Remove open_session tracing
Diffstat (limited to 'core')
| -rw-r--r-- | core/s2smanager.lua | 9 | ||||
| -rw-r--r-- | core/sessionmanager.lua | 11 |
2 files changed, 2 insertions, 18 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 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 |