* arm the thread on shutdown killer. killing is better then waiting for a -9 from...

[citadel.git] / citadel / threads.c

diff --git a/citadel/threads.c b/citadel/threads.c
index e115306a2e1ed640719304008ec6f7d3fefd6c2d..40c4cca4c8c55cfde88f00cf6598689a36a6b858 100644 (file)
--- a/citadel/threads.c
+++ b/citadel/threads.c
@@ -694,13 +694,13 @@ void CtdlThreadGC (void)
                
                if (that_thread->stop_ticker + 5 == time(NULL))
                {
-                       CtdlLogPrintf(CTDL_DEBUG, "Thread System: The thread \"%s\" (0x%08lx) failed to self terminate within 5 ticks. It would be cancelled now.\n", that_thread->name, that_thread->tid);
+                       CtdlLogPrintf(CTDL_DEBUG, "Thread System: The thread \"%s\" (0x%08lx) failed to self terminate within 5 ticks. Canceling now.\n", that_thread->name, that_thread->tid);
                        if ((that_thread->flags & CTDLTHREAD_WORKER) == 0)
                                CtdlLogPrintf(CTDL_INFO, "Thread System: A non worker thread would have been canceled this may cause message loss.\n");
-//                     that_thread->state = CTDL_THREAD_CANCELLED;
+                       that_thread->state = CTDL_THREAD_CANCELLED;
                        that_thread->stop_ticker++;
-//                     citthread_cancel(that_thread->tid);
-//                     continue;
+                       citthread_cancel(that_thread->tid);
+                       continue;
                }
                
                /* Do we need to clean up this thread? */