Module: check_mk
Branch: master
Commit: a6628cf076544289e5c3ac38456b213a3bf7bdcb
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6628cf0765442…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Feb 2 09:42:34 2011 +0100
Fixed error handling of clustered SNMP hosts
---
ChangeLog | 1 +
modules/check_mk_base.py | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d442f49..b75f5e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
1.1.9i7:
Core, Setup, etc.:
* Fix crash on Python 2.4 (e.g. RedHat) with fake_file
+ * Fixed clustering of SNMP hosts
1.1.9i6:
INCOMPATIBLE CHANGES:
diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py
index 6bfb6eb..f316ef5 100755
--- a/modules/check_mk_base.py
+++ b/modules/check_mk_base.py
@@ -270,10 +270,10 @@ def get_host_info(hostname, ipaddress, checkname):
except MKAgentError, e:
exception_texts.append(str(e))
g_broken_agent_hosts.add(node)
- except SNMPErrorError, e:
+ except MKSNMPError, e:
exception_texts.append(str(e))
g_broken_snmp_hosts.add(node)
- is_snmp_error = true
+ is_snmp_error = True
if not at_least_one_without_exception:
if is_snmp_error:
raise MKSNMPError(", ".join(exception_texts))