Now check for scheduled shutdown in garbage collector.

diff --git a/citadel/server_main.c b/citadel/server_main.c
index 9769f0795b3adffe01902d66a6e26cbc6ec24635..98d0162e575c628e014c5cca97945c2da9e7562f 100644 (file)
--- 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 6b572a7894e78c020872f38f1be63e4c197bae80..552183dd2a215eafc4ba30a6c77228be1b94ba59 100644 (file)
--- 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);