From: Dave West <davew@uncensored.citadel.org>
Date: Fri, 30 Nov 2007 22:03:37 +0000 (+0000)
Subject: Now check for scheduled shutdown in garbage collector.
X-Git-Tag: v7.86~2711
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=ff1cc6971a65989ab7e46d47f691f6246c0eef49;p=citadel.git

Now check for scheduled shutdown in garbage collector.
---

diff --git a/citadel/server_main.c b/citadel/server_main.c
index 9769f0795..98d0162e5 100644
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -375,6 +375,7 @@ void go_threading(void)
 	{
 		if (exit_signal)
 			CtdlThreadStopAll();
+		check_sched_shutdown();
 		begin_critical_section(S_THREAD_LIST);
 		ctdl_thread_internal_calc_loadavg();
 		end_critical_section(S_THREAD_LIST);
diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index 6b572a789..552183dd2 100644
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -2102,7 +2102,6 @@ SKIP_SELECT:
 
 		dead_session_purge(force_purge);
 		do_housekeeping();
-		check_sched_shutdown();
 	}
 	/* If control reaches this point, the server is shutting down */	
 	return(NULL);