[icinga-checkins] icinga.org: icinga-core/mfriedrich/ido: terminate threads cleanly, including db connection

git at icinga.org git at icinga.org
Tue Nov 15 15:10:59 CET 2011


Module: icinga-core
Branch: mfriedrich/ido
Commit: 65a56da367a764b9b39a86fc44fd88771ae93a18
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=65a56da367a764b9b39a86fc44fd88771ae93a18

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Nov 15 15:10:35 2011 +0100

terminate threads cleanly, including db connection

---

 module/idoutils/src/ido2db.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/module/idoutils/src/ido2db.c b/module/idoutils/src/ido2db.c
index 7e36468..51566bf 100644
--- a/module/idoutils/src/ido2db.c
+++ b/module/idoutils/src/ido2db.c
@@ -1250,8 +1250,7 @@ int ido2db_handle_client_connection(int sd) {
 			ido2db_log_debug_info(IDO2DB_DEBUGL_PROCESSINFO, 2, "ido2db_handle_client_connection() idi.dbinfo.connected is '%d'\n", idi.dbinfo.connected);
 
 			/* terminate threads */
-			/*terminate_worker_thread();*/
-			terminate_cleanup_thread();
+			ido2db_terminate_threads();
 
 			/* free memory allocated to dynamic buffer */
 			ido_dbuf_free(&dbuf);
@@ -1369,8 +1368,7 @@ int ido2db_handle_client_connection(int sd) {
 #endif
 
 	/* terminate threads */
-	/*terminate_worker_thread();*/
-	terminate_cleanup_thread();
+	ido2db_terminate_threads();
 
 	/* free memory allocated to dynamic buffer */
 	ido_dbuf_free(&dbuf);





More information about the icinga-checkins mailing list