aboutsummaryrefslogtreecommitdiffstats
path: root/core/sessionmanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-08 17:22:15 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-08 17:22:15 +0100
commit94b629076096ad83c60c01af607d3aee160584b4 (patch)
treeb63f60f6dff8c647f5952a2a92bb0a1da8d2a94f /core/sessionmanager.lua
parent308088b1faaf9a50df3432378e0bc4be52b35ab3 (diff)
parent7e9a5cc5a36ae7d653836615143b5a78a505bfed (diff)
downloadprosody-94b629076096ad83c60c01af607d3aee160584b4.tar.gz
prosody-94b629076096ad83c60c01af607d3aee160584b4.zip
Merge 0.9->trunk
Diffstat (limited to 'core/sessionmanager.lua')
-rw-r--r--core/sessionmanager.lua11
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