Module: check_mk
Branch: master
Commit: 1345846392e78e868bec95b753cd3e44c5d280cb
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1345846392e78e…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Sep 8 14:37:28 2011 +0200
FIX: fix rescheduling of host check
---
ChangeLog | 4 ++++
web/htdocs/actions.py | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ed4d416..32af37d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1.1.12b1:
+ Multisite:
+ * FIX: fix rescheduling of host check
+
1.1.11i4:
Core, Setup, etc.:
* FIX: use hostgroups instead of host_groups in Nagios configuration.
diff --git a/web/htdocs/actions.py b/web/htdocs/actions.py
index 781fcf5..bd34eb4 100644
--- a/web/htdocs/actions.py
+++ b/web/htdocs/actions.py
@@ -64,13 +64,13 @@ def action_reschedule():
html.live.set_only_sites([site])
row = html.live.query_row(
"GET %ss\n"
- "WaitObject: %s;%s\n"
+ "WaitObject: %s\n"
"WaitCondition: last_check >= %d\n"
"WaitTimeout: %d\n"
"WaitTrigger: check\n"
"Columns: last_check state plugin_output\n"
"Filter: host_name = %s\n%s"
- % (what, host, service, now, config.reschedule_timeout * 1000, host,
add_filter))
+ % (what, spec, now, config.reschedule_timeout * 1000, host, add_filter))
html.live.set_only_sites()
last_check = row[0]
if last_check < now: