[checkmk-commits] Reverted part of todays small caching cleanup

Module: check_mk Branch: master Commit: 116ee5be9132a21fb5086b4adcc9bde62ebea0c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=116ee5be9132a2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 3 16:41:32 2015 +0100 Reverted part of todays small caching cleanup --- ChangeLog | 4 ++-- modules/check_mk.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea5a731..347bcaf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -133,10 +133,10 @@ * 2876 FIX: mk_logwatch: Avoid parsing lines that are currently being written by application... * 2806 FIX: oracle_rman: introduced missing WATO, allows configuration of backup age * 2883 FIX: default.php template: fixed id_string while creating default template, e.g. for custom checks - * 1309 FIX: multipath: Fixed name handling of multipaths... - NOTE: Please refer to the migration notes! * 2859 FIX: Check_MK Discovery/Inventory and HW/SW Inventory services are now always using caches (if available)... * 2860 FIX: mssql.vbs: Now really used the configuration file from the agent config directory + * 1309 FIX: multipath: Fixed name handling of multipaths... + NOTE: Please refer to the migration notes! Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/modules/check_mk.py b/modules/check_mk.py index d39a585..25436c0 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4622,7 +4622,8 @@ def do_check_keepalive(): sys.stderr.flush() cleanup_globals() # Prepare for next check - restore_use_cachefile() + global opt_use_cachefile + opt_use_cachefile = True restore_original_agent_caching_usage() # Check if all global variables are clean, but only in verbose logging mode