From: Art Cancro <ajc@citadel.org>
Date: Fri, 20 Nov 2009 03:11:20 +0000 (+0000)
Subject: * Reverted r8058 because it is crashing Uncensored quite a lot.
X-Git-Tag: v7.86~600
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=3a532a1830bdc2e9fef1381f1f5713148653f397

* Reverted r8058 because it is crashing Uncensored quite a lot.
---

diff --git a/citadel/threads.c b/citadel/threads.c
index 40c4cca4c..e115306a2 100644
--- 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. Canceling 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. It would be cancelled 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? */