[icinga-checkins] icinga.org: icinga-core/r1.6: fix leftovers from massive merge

git at icinga.org git at icinga.org
Tue Nov 15 18:56:50 CET 2011


Module: icinga-core
Branch: r1.6
Commit: 61a109a8d1f62fb7eda8d103a638c3d7cb11efbf
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=61a109a8d1f62fb7eda8d103a638c3d7cb11efbf

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Nov 15 18:55:37 2011 +0100

fix leftovers from massive merge

---

 module/idoutils/src/dbhandlers.c |    1 +
 module/idoutils/src/idomod.c     |    3 ---
 module/idoutils/src/logging.c    |    2 --
 3 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/module/idoutils/src/dbhandlers.c b/module/idoutils/src/dbhandlers.c
index 396371b..bf4f6c5 100644
--- a/module/idoutils/src/dbhandlers.c
+++ b/module/idoutils/src/dbhandlers.c
@@ -17,6 +17,7 @@
 #include "../include/dbhandlers.h"
 #include "../include/dbqueries.h"
 #include "../include/sla.h"
+#include "../include/logging.h"
 
 /* Icinga header files */
 #include "../../../include/icinga.h"
diff --git a/module/idoutils/src/idomod.c b/module/idoutils/src/idomod.c
index c864bd6..55ae6f9 100644
--- a/module/idoutils/src/idomod.c
+++ b/module/idoutils/src/idomod.c
@@ -4753,9 +4753,6 @@ int idomod_log_debug_info(int level, int verbosity, const char *fmt, ...) {
 	/* flush, so we don't have problems tailing or when fork()ing */
 	fflush(idomod_debug_file_fp);
 
-	/* unlock the mutex so only one thread can write */
-	pthread_mutex_unlock(&log_lock);
-
 	/* if file has grown beyond max, rotate it */
 	if ((unsigned long)ftell(idomod_debug_file_fp) > idomod_max_debug_file_size && idomod_max_debug_file_size > 0L) {
 
diff --git a/module/idoutils/src/logging.c b/module/idoutils/src/logging.c
index 509bc53..84873b4 100644
--- a/module/idoutils/src/logging.c
+++ b/module/idoutils/src/logging.c
@@ -27,8 +27,6 @@ extern int ido2db_debug_verbosity;
 extern FILE *ido2db_debug_file_fp;
 extern unsigned long ido2db_max_debug_file_size;
 
-extern pthread_mutex_t log_lock;
-
 extern int ido2db_debug_readable_timestamp;
 
 /****************************************************************************/





More information about the icinga-checkins mailing list