prosody
ebd65feb188c
core/sessionmanager.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

core/sessionmanager.lua @ 123:ebd65feb188c

Fix for not destroying sessions when connection closed.
author Matthew Wild <mwild1@gmail.com>
date Thu, 23 Oct 2008 16:07:40 +0100
parent 118:76ac96c53ee5
child 124:7fee6b63abca
line wrap: on
line diff
--- a/core/sessionmanager.lua	Thu Oct 23 14:39:42 2008 +0100
+++ b/core/sessionmanager.lua	Thu Oct 23 16:07:40 2008 +0100
@@ -19,21 +19,22 @@
 
 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 @@
 			session[k] = nil;
 		end
 	end
-	collectgarbage("collect");
-	collectgarbage("collect");
-	collectgarbage("collect");
-	collectgarbage("collect");
-	collectgarbage("collect");
 end
 
 function send_to_session(session, data)