[checkmk-commits] Check_MK Git: check_mk: FIX: fix two problems when reloading module in Icinga (thanks to Ronny Biering)

Module: check_mk Branch: master Commit: e235658500bd98e102a7cd56606b2348fc43c80d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e235658500bd98… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 20 14:32:02 2012 +0100 FIX: fix two problems when reloading module in Icinga (thanks to Ronny Biering) --- ChangeLog | 3 +++ livestatus/src/logger.c | 4 +++- livestatus/src/module.c | 1 + 3 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f34a68..05b7c21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -232,6 +232,9 @@ * FIX: performeter_temparature now returns unicode string, because of °C * FIX: output_format json in webservices now using " as quotes + Livestatus: + * FIX: fix two problems when reloading module in Icinga (thanks to Ronny Biering) + 1.2.0p3: Mulitisite * Added "view" parameter to dashlet_pnpgraph webservice diff --git a/livestatus/src/logger.c b/livestatus/src/logger.c index 3872e2c..82bb982 100644 --- a/livestatus/src/logger.c +++ b/livestatus/src/logger.c @@ -44,8 +44,10 @@ void open_logfile() void close_logfile() { - if (g_logfile) + if (g_logfile) { fclose(g_logfile); + g_logfile = 0; + } } void logger(int priority, const char *loginfo, ...) diff --git a/livestatus/src/module.c b/livestatus/src/module.c index 73bdcd8..94ac6c8 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -286,6 +286,7 @@ void terminate_threads() if (g_debug_level > 0) logger(LG_INFO, "Main thread + %u client threads have finished", g_num_clientthreads); g_thread_running = 0; + g_should_terminate = false; } free(g_clientthread_id); }