[checkmk-commits] Check_MK Git: check_mk: Fixed exception in ps check when counters are cleared after short rewrite of counter handling

Module: check_mk Branch: master Commit: f5126dd2e47e0b166804fe428ddb1ee3ed67b821 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5126dd2e47e0b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 27 10:35:35 2015 +0200 Fixed exception in ps check when counters are cleared after short rewrite of counter handling --- modules/check_mk_base.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 2e4e8e3..cd6b67c 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1092,13 +1092,14 @@ def last_counter_wrap(): # Deletes counters from g_item_state matching the given pattern and are older_than x seconds. # This is a neccessary cleanup just used by ps.include. Not nice. -def clear_counters(prefix, older_than): +def clear_counters(check_type_prefix, older_than): global g_item_state counters_to_delete = [] now = time.time() for name, (timestamp, value) in g_item_state.items(): - if name.startswith(prefix): + joined_name = type(name) == tuple and name[0] or name + if joined_name.startswith(check_type_prefix): if now > timestamp + older_than: counters_to_delete.append(name)