From: pk910 Date: Thu, 27 Sep 2012 23:22:12 +0000 (+0200) Subject: fixed log mutex location X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=commitdiff_plain;h=e5d88c80c393d6e0043211c06693ef6938a157ba fixed log mutex location --- diff --git a/src/log.c b/src/log.c index 9907f2b..44d63df 100644 --- a/src/log.c +++ b/src/log.c @@ -31,6 +31,9 @@ static void load_log_targets(); static void unload_log_targets(); static int reload_log_targets(int init); +#ifdef HAVE_THREADS +static pthread_mutex_t log_sync; +#endif #define LOG_TARGET_TYPE_FILE 1 #define LOG_TARGET_TYPE_STDOUT 2 @@ -284,6 +287,9 @@ static IOHANDLER_LOG_BACKEND(log_iohandler_backend) { } void init_log() { + #if HAVE_THREADS + THREAD_MUTEX_INIT(log_sync); + #endif load_log_targets(); bind_reload(reload_log_targets, 0); iolog_backend = log_iohandler_backend; diff --git a/src/main.c b/src/main.c index d2c482a..c88c02c 100644 --- a/src/main.c +++ b/src/main.c @@ -52,7 +52,6 @@ struct ProcessState process_state; #ifdef HAVE_THREADS pthread_mutex_t cache_sync; pthread_mutex_t whohandler_sync, whohandler_mass_sync; -static pthread_mutex_t log_sync; static pthread_t *current_threads = NULL; #endif @@ -336,7 +335,6 @@ int main(int argc, char *argv[]) { free(modulelist); #if HAVE_THREADS - THREAD_MUTEX_INIT(log_sync); THREAD_MUTEX_INIT(cache_sync); THREAD_MUTEX_INIT(whohandler_sync); THREAD_MUTEX_INIT(whohandler_mass_sync);