Module: check_mk
Branch: master
Commit: 2009441e076893782cbddb45f3a60f64711db683
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2009441e076893…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Tue Jul 30 12:01:32 2013 +0200
windows agent: bugfix: wait for plugins to finish when caching is disabled
---
agents/windows/check_mk_agent.cc | 2 +-
agents/windows/check_mk_agent.exe | Bin 151040 -> 151040 bytes
agents/windows/install_agent.exe | Bin 146432 -> 146572 bytes
3 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc
index efeeaf6..16773bf 100755
--- a/agents/windows/check_mk_agent.cc
+++ b/agents/windows/check_mk_agent.cc
@@ -2410,7 +2410,7 @@ void run_external_programs(char *dirname, script_type type, bool
dry_run = false
cont, // argument to thread function
0, // use default creation flags
NULL); // returns the thread identifier
- if (g_caching_method == CACHE_OFF && g_caching_method ==
CACHE_SYNC) {
+ if (g_caching_method == CACHE_OFF || g_caching_method == CACHE_SYNC)
{
crash_log("Thread wait (%s): %s",
(g_caching_method == CACHE_OFF ? "CACHE OFF" :
"CACHE SYNC"), cont->path);
WaitForSingleObject(cont->worker_thread, INFINITE);
diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe
index f8a42ac..5204606 100755
Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe
differ
diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe
index 6623c5b..dac059e 100755
Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe
differ