Module: check_mk
Branch: master
Commit: ecdb23fa8d9498b788f2fca25ce4237bd22bd532
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecdb23fa8d9498…
Author: Tom Baerwinkel <tb(a)mathias-kettner.de>
Date: Tue Jul 31 16:19:19 2018 +0200
Fix crash during bulk discovery of hosts
Change-Id: If68750b1653184a6de3887ca4a1fab2b4400eada
---
cmk/gui/wato/__init__.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py
index e21d4c8..ddfcc12 100644
--- a/cmk/gui/wato/__init__.py
+++ b/cmk/gui/wato/__init__.py
@@ -4505,8 +4505,8 @@ class ModeBulkDiscovery(WatoMode):
# start : Rendering of the progress dialog
# transaction : Single step processing
if self._start or html.is_transaction():
- bulk_discover_params =
cmk.gui.plugins.wato.vs_bulk_discovery.from_html_vars("bulkinventory")
- cmk.gui.plugins.wato.vs_bulk_discovery.validate_value(bulk_discover_params,
"bulkinventory")
+ bulk_discover_params =
cmk.gui.plugins.wato.vs_bulk_discovery().from_html_vars("bulkinventory")
+ cmk.gui.plugins.wato.vs_bulk_discovery().validate_value(bulk_discover_params,
"bulkinventory")
self._bulk_discovery_params.update(bulk_discover_params)
self._recurse, self._only_failed, self._only_failed_invcheck, \
@@ -4556,7 +4556,7 @@ class ModeBulkDiscovery(WatoMode):
if not self._error_handling:
arguments = [ "@raiseerrors" ] + arguments
- timeout = html.request_timeout() - 2
+ timeout = html.request.request_timeout - 2
watolib.unlock_exclusive() # Avoid freezing WATO when hosts do not respond
timely
counts, failed_hosts = watolib.check_mk_automation(site_id,
"inventory",