From: Art Cancro <ajc@citadel.org>
Date: Thu, 17 Mar 2011 16:48:54 +0000 (-0400)
Subject: Temporarily disable terminate_stuck_sessions() because it is running at unexpected... 
X-Git-Tag: v8.11~817
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=3197722cfc2778aaeed7a70cf655cd430cd9ef2e

Temporarily disable terminate_stuck_sessions() because it is running at unexpected times
---

diff --git a/citadel/context.c b/citadel/context.c
index 1bdea3829..2a522066a 100644
--- a/citadel/context.c
+++ b/citadel/context.c
@@ -306,8 +306,19 @@ void terminate_idle_sessions(void)
 		syslog(LOG_INFO, "Didn't terminate %d protected idle sessions;\n", killed);
 }
 
+
+/*
+ * During shutdown, close the sockets of any sessions still connected.
+ */
 void terminate_stuck_sessions(void)
 {
+
+	return;
+	/* FIXME this function has been disabled because it is somehow being
+	 * called at times other than server shutdown, which is throwing all
+	 * the users off.  EPIC FAIL!!!
+	 */
+
 	CitContext *ccptr;
 	int killed = 0;
 
@@ -315,14 +326,16 @@ void terminate_stuck_sessions(void)
 	for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
 		if (ccptr->client_socket != -1)
 		{
+			syslog(LOG_INFO, "terminate_stuck_sessions() is murdering %s", ccptr->curr_user);
 			close(ccptr->client_socket);
 			ccptr->client_socket = -1;
 			killed++;
 		}
 	}
 	end_critical_section(S_SESSION_TABLE);
-	if (killed > 0)
+	if (killed > 0) {
 		syslog(LOG_INFO, "Flushed %d stuck sessions\n", killed);
+	}
 }