Decrement num_workers when exiting worker_thread() under _any_ circumstances.

[citadel.git] / citadel / threads.c

diff --git a/citadel/threads.c b/citadel/threads.c
index 965f866da2c31c44000988c8b3caf484c52d4aa3..eda189281c83ad572183fb60482fb26948b3d8db 100644 (file)
--- a/citadel/threads.c
+++ b/citadel/threads.c
@@ -217,9 +217,11 @@ void go_threading(void)
        CtdlShutdownServiceHooks();             /* close all listener sockets to prevent new connections */
        PerformSessionHooks(EVT_SHUTDOWN);      /* run any registered shutdown hooks */
 
-       int countdown = 10;
+       int countdown = 30;
        while ( (num_workers > 0) && (countdown-- > 0)) {
-               syslog(LOG_DEBUG, "Waiting for %d worker threads to exit", num_workers);
+               syslog(LOG_DEBUG, "Waiting %d seconds for %d worker threads to exit",
+                       countdown, num_workers
+               );
                sleep(1);
        }
 }