aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/sessionmanager.lua14
-rw-r--r--net/xmppclient_listener.lua13
2 files changed, 18 insertions, 9 deletions
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 8bdb93d0..b012ac6c 100644
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -19,21 +19,22 @@ local getmetatable = getmetatable;
module "sessionmanager"
+local open_sessions = 0;
+
function new_session(conn)
local session = { conn = conn, priority = 0, type = "c2s_unauthed" };
if true then
session.trace = newproxy(true);
- getmetatable(session.trace).__gc = function () print("Session got collected") end;
+ getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; print("Session got collected, now "..open_sessions.." sessions are allocated") end;
end
+ open_sessions = open_sessions + 1;
local w = conn.write;
session.send = function (t) w(tostring(t)); end
return session;
end
function destroy_session(session)
- if not (session and session.disconnect) then return; end
- log("debug", "Destroying session...");
- session.disconnect();
+ session.log("info", "Destroying session");
if session.username then
if session.resource then
hosts[session.host].sessions[session.username].sessions[session.resource] = nil;
@@ -53,11 +54,6 @@ function destroy_session(session)
session[k] = nil;
end
end
- collectgarbage("collect");
- collectgarbage("collect");
- collectgarbage("collect");
- collectgarbage("collect");
- collectgarbage("collect");
end
function send_to_session(session, data)
diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua
index 7d5b3abe..e722e55b 100644
--- a/net/xmppclient_listener.lua
+++ b/net/xmppclient_listener.lua
@@ -69,6 +69,19 @@ function xmppclient.listener(conn, data)
end
function xmppclient.disconnect(conn)
+ local session = sessions[conn];
+ if session then
+ if session.last_presence and session.last_presence.attr.type ~= "unavailable" then
+ local pres = st.presence{ type = "unavailable" };
+ if err == "closed" then err = "connection closed"; end
+ pres:tag("status"):text("Disconnected: "..err);
+ session.stanza_dispatch(pres);
+ end
+ sm_destroy_session(session);
+ sessions[conn] = nil;
+ session = nil;
+ collectgarbage("collect");
+ end
end
connlisteners_register("xmppclient", xmppclient);