Changeset

5447:92b88476873a

sessionmanager, s2smanager: Remove open_session tracing
author Matthew Wild <mwild1@gmail.com>
date Mon, 08 Apr 2013 15:53:18 +0100
parents 5445:9054b51e71a4
children 5448:cbe9fa2d3787
files core/s2smanager.lua core/sessionmanager.lua
diffstat 2 files changed, 2 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/core/s2smanager.lua	Mon Apr 08 15:32:24 2013 +0100
+++ b/core/s2smanager.lua	Mon Apr 08 15:53:18 2013 +0100
@@ -24,15 +24,8 @@
 
 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 @@
 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
--- a/core/sessionmanager.lua	Mon Apr 08 15:32:24 2013 +0100
+++ b/core/sessionmanager.lua	Mon Apr 08 15:53:18 2013 +0100
@@ -29,17 +29,8 @@
 
 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 @@
 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