[checkmk-commits] 4582 FIX Prevent timeout messages in passive service, should be reported by Check_MK service

Module: check_mk Branch: master Commit: 1a5203871a2a6268795ad5b41a24482bbe1b47b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a5203871a2a62… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 5 16:16:37 2017 +0200 4582 FIX Prevent timeout messages in passive service, should be reported by Check_MK service Change-Id: I93bb0fb4d8096913291a2a24e3e9f9472e2e171b --- .werks/4582 | 10 ++++++++++ modules/check_mk_base.py | 3 +++ 2 files changed, 13 insertions(+) diff --git a/.werks/4582 b/.werks/4582 new file mode 100644 index 0000000..70b4d6f --- /dev/null +++ b/.werks/4582 @@ -0,0 +1,10 @@ +Title: Prevent timeout messages in passive service, should be reported by Check_MK service +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1491401772 +Class: fix + + diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 7e08189..30f13a2 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1434,6 +1434,9 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None, fetch_ag console.verbose("%-20s PEND - Cannot compute check result: %s\n" % (description, e)) dont_submit = True + except MKTimeout: + raise + except Exception, e: if cmk.debug.enabled(): raise