Module: check_mk
Branch: master
Commit: a236bd0322ff2387f937d3e16cbf3eb09fa29b35
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a236bd0322ff23…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Feb 17 12:05:35 2016 +0100
#3223 FIX Fixed exception in network scan when hosts can not be resolved
---
.werks/3223 | 10 ++++++++++
ChangeLog | 1 +
web/htdocs/wato.py | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/.werks/3223 b/.werks/3223
new file mode 100644
index 0000000..c79893a
--- /dev/null
+++ b/.werks/3223
@@ -0,0 +1,10 @@
+Title: Fixed exception in network scan when hosts can not be resolved
+Level: 1
+Component: wato
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.9i1
+Date: 1455707111
+
+
diff --git a/ChangeLog b/ChangeLog
index acb7bbd..01c621d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,7 @@
* 3215 FIX: WATO git ignore files are now updated on each commit
* 3216 FIX: Fixed exception when trying to edit an already deleted user
* 3222 FIX: Fixed broken duplicate user id validation when creating new users
+ * 3223 FIX: Fixed exception in network scan when hosts can not be resolved
Event Console:
* 3058 FIX: Event Console is now allowing non loadable MIB modules on startup...
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 2f12de9..c132dd4 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -15250,7 +15250,7 @@ def ping_worker(addresses, hosts):
try:
host_name = socket.gethostbyaddr(ipaddress)[0]
except socket.error:
- host_name = address
+ host_name = ipaddress
hosts.append((host_name, ipaddress))