mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for not destroying sessions when connection closed.

Browse source
This commit is contained in:
Matthew Wild 2008-10-23 16:07:40 +01:00
parent b13393bcd9
commit ff0fe0544a
2 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
core/sessionmanager.lua
View file

@ -19,21 +19,22 @@ local getmetatable = getmetatable;
module "sessionmanager" module "sessionmanager"
local open_sessions = 0;
function new_session(conn) function new_session(conn)
local session = { conn = conn, priority = 0, type = "c2s_unauthed" }; local session = { conn = conn, priority = 0, type = "c2s_unauthed" };
if true then if true then
session.trace = newproxy(true); 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 end
open_sessions = open_sessions + 1;
local w = conn.write; local w = conn.write;
session.send = function (t) w(tostring(t)); end session.send = function (t) w(tostring(t)); end
return session; return session;
end end
function destroy_session(session) function destroy_session(session)
if not (session and session.disconnect) then return; end session.log("info", "Destroying session");
log("debug", "Destroying session...");
session.disconnect();
if session.username then if session.username then
if session.resource then if session.resource then
hosts[session.host].sessions[session.username].sessions[session.resource] = nil; hosts[session.host].sessions[session.username].sessions[session.resource] = nil;
@ -53,11 +54,6 @@ function destroy_session(session)
session[k] = nil; session[k] = nil;
end end
end end
collectgarbage("collect");
collectgarbage("collect");
collectgarbage("collect");
collectgarbage("collect");
collectgarbage("collect");
end end
function send_to_session(session, data) function send_to_session(session, data)

13
net/xmppclient_listener.lua
View file

@ -69,6 +69,19 @@ function xmppclient.listener(conn, data)
end end
function xmppclient.disconnect(conn) 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 end
connlisteners_register("xmppclient", xmppclient); connlisteners_register("xmppclient", xmppclient);