Module: check_mk
Branch: master
Commit: d0e6f04848a29793f6359161fb4aaa710739f182
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0e6f04848a297…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Dec 11 09:28:13 2015 +0100
Cleaned up keepalive mode handling code a bit
---
modules/check_mk.py | 2 ++
modules/check_mk_base.py | 6 ++++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/modules/check_mk.py b/modules/check_mk.py
index 50f39c6..0c5007f 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -4436,6 +4436,8 @@ ignore_changed_global_variables = [
'all_clusters_untagged',
]
+vars_before_config = set([])
+
# Now - at last - we can read in the user's configuration files
def all_nonfunction_vars():
return set([ name for name,value in globals().items()
diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py
index 41ac1ed..569f615 100644
--- a/modules/check_mk_base.py
+++ b/modules/check_mk_base.py
@@ -1263,9 +1263,11 @@ def do_check(hostname, ipaddress, only_check_types = None):
run_time = time.time() - start_time
if check_mk_perfdata_with_times:
- times = os.times()
if opt_keepalive:
- times = map(lambda a: a[0]-a[1], zip(times, g_initial_times))
+ times = get_keepalive_times()
+ else:
+ times = os.times()
+
output += "execution time %.1f sec|execution_time=%.3f user_time=%.3f
"\
"system_time=%.3f children_user_time=%.3f
children_system_time=%.3f\n" %\
(run_time, run_time, times[0], times[1], times[2], times[3])