From 28304ba812b3f1b39086c362fb8a0e8a78964f65 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Mon, 7 Jun 2010 22:06:50 +0000
Subject: [PATCH] * move initialization of context to the top * clean up
 context on exit

---
 citadel/modules/expire/serv_expire.c       | 4 ++--
 citadel/modules/fulltext/serv_fulltext.c   | 3 ++-
 citadel/modules/network/serv_network.c     | 2 ++
 citadel/modules/rssclient/serv_rssclient.c | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/citadel/modules/expire/serv_expire.c b/citadel/modules/expire/serv_expire.c
index ac1a6f8aa..eaae100b3 100644
--- a/citadel/modules/expire/serv_expire.c
+++ b/citadel/modules/expire/serv_expire.c
@@ -864,10 +864,9 @@ void *purge_databases(void *args)
         struct tm tm;
 	struct CitContext purgerCC;
 
-	CtdlLogPrintf(CTDL_DEBUG, "Auto-purger_thread() initializing\n");
-
 	CtdlFillSystemContext(&purgerCC, "purger");
 	citthread_setspecific(MyConKey, (void *)&purgerCC );
+	CtdlLogPrintf(CTDL_DEBUG, "Auto-purger_thread() initializing\n");
 
         while (!CtdlThreadCheckStop()) {
                 /* Do the auto-purge if the current hour equals the purge hour,
@@ -945,6 +944,7 @@ void *purge_databases(void *args)
                 	CtdlLogPrintf(CTDL_INFO, "Auto-purger: STOPPED.\n");
 
         }
+	CtdlClearSystemContext();
         return NULL;
 }
 /*****************************************************************************/
diff --git a/citadel/modules/fulltext/serv_fulltext.c b/citadel/modules/fulltext/serv_fulltext.c
index 1e461a152..f6266e9c4 100644
--- a/citadel/modules/fulltext/serv_fulltext.c
+++ b/citadel/modules/fulltext/serv_fulltext.c
@@ -374,10 +374,10 @@ void do_fulltext_indexing(void) {
 void *indexer_thread(void *arg) {
 	struct CitContext indexerCC;
 
-	CtdlLogPrintf(CTDL_DEBUG, "indexer_thread() initializing\n");
 
 	CtdlFillSystemContext(&indexerCC, "indexer");
 	citthread_setspecific(MyConKey, (void *)&indexerCC );
+	CtdlLogPrintf(CTDL_DEBUG, "indexer_thread() initializing\n");
 
 	while (!CtdlThreadCheckStop()) {
 		do_fulltext_indexing();
@@ -385,6 +385,7 @@ void *indexer_thread(void *arg) {
 	}
 
 	CtdlLogPrintf(CTDL_DEBUG, "indexer_thread() exiting\n");
+	CtdlClearSystemContext();
 	return NULL;
 }
 
diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c
index 9ed349bab..b3d3d4617 100644
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -2232,6 +2232,7 @@ void *network_do_queue(void *args) {
 	 * with a static variable instead.
 	 */
 	if (doing_queue) {
+		CtdlClearSystemContext();
 		return NULL;
 	}
 	doing_queue = 1;
@@ -2319,6 +2320,7 @@ void *network_do_queue(void *args) {
 	else {
 		CtdlLogPrintf(CTDL_DEBUG, "network: Task STOPPED.\n");
 	}
+	CtdlClearSystemContext();
 	return NULL;
 }
 
diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index de4c48cfc..c69f6b4ad 100644
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -902,6 +902,7 @@ void *rssclient_scan(void *args) {
 		CtdlThreadSchedule ("RSS Client", CTDLTHREAD_BIGSTACK, rssclient_scan, NULL, last_run + config.c_net_freq);
 	else
 		CtdlLogPrintf(CTDL_DEBUG, "rssclient: Task STOPPED.\n");
+	CtdlClearSystemContext();
 	return NULL;
 }
 
-- 
2.30.2