[checkmk-commits] Check_MK Git: check_mk: windows agent: cache_age parameter also applies when async/sync caching is disabled

Module: check_mk Branch: master Commit: c24e7078bf2b14457127e14b8f1383d7de18798f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c24e7078bf2b14… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 23 16:34:44 2013 +0200 windows agent: cache_age parameter also applies when async/sync caching is disabled --- agents/windows/check_mk_agent-64.exe | Bin 178688 -> 178688 bytes agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 151040 -> 151040 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent-64.exe | Bin 148924 -> 148906 bytes agents/windows/install_agent.exe | Bin 146405 -> 146421 bytes agents/windows/nowin.exe | Bin 22511 -> 22511 bytes 7 files changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 0b4e707..e8a9f86 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 4c9fda2..d419e02 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2380,7 +2380,7 @@ void run_external_programs(char *dirname, script_type type, bool dry_run = false cont->should_terminate = 0; cont->timeout = get_script_timeout(name, type); cont->max_retries = get_script_max_retries(name, type); - cont->max_age = g_caching_method == CACHE_OFF ? 0 : get_script_cache_age(name, type); + cont->max_age = get_script_cache_age(name, type); cont->status = SCRIPT_IDLE; cont->last_problem = SCRIPT_NONE; script_containers[cont->path] = cont; diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 86fc5cd..ee73ef2 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 1b7e962..656ef00 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index e55d5fa..34093dd 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index b71b869..6865768 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index f1e64ac..3c18eb6 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ