[icinga-checkins] icinga.org: icinga-core/mfriedrich/ido: core: fix next_check attribute not updated after scheduling new check #2265 - MF

git at icinga.org git at icinga.org
Wed Oct 3 01:14:53 CEST 2012


Module: icinga-core
Branch: mfriedrich/ido
Commit: b3b89b29c44e247e2f733aea259e798b890c9c97
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=b3b89b29c44e247e2f733aea259e798b890c9c97

Author: Michael Friedrich <michael.friedrich at gmail.com>
Date:   Mon Sep 24 16:09:11 2012 +0200

core: fix next_check attribute not updated after scheduling new check #2265 - MF

previously, we did not send an update to all neb modules after having
scheduled a check event - therefore next_check was not correctly updated
in idoutils/icinga-web. now doing so, an immediate update query will
follow once a check is scheduled.

refs #2265

---

 Changelog     |    1 +
 base/checks.c |    6 ++++++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/Changelog b/Changelog
index d891045..1ec030b 100644
--- a/Changelog
+++ b/Changelog
@@ -87,6 +87,7 @@ FIXES
 * core: fixed when deleting an expiring ack the event to delete the ack doesn't get deleted #3084 - RB
 * core: fix error checking on subgroup expanding on host|service|contactgroup members #3088 - MF/RB
 * core: fix lockup on DEL_DOWNTIME_BY_HOST_NAME command #1572 - MF
+* core: fix next_check attribute not updated after scheduling new check #2265 - MF
 
 * classic ui: fix setting send_notification or sticky_ack as GET param has no effect on cmd.cgi acks #2926 - MF
 	** now you can finally disable checkboxes default ticked with these options
diff --git a/base/checks.c b/base/checks.c
index 844c42c..db4617f 100644
--- a/base/checks.c
+++ b/base/checks.c
@@ -1985,6 +1985,9 @@ void schedule_service_check(service *svc, time_t check_time, int options) {
 		log_debug_info(DEBUGL_CHECKS, 2, "Keeping original service check event (ignoring the new one).\n");
 	}
 
+	/* update next_check time for service */
+	update_service_status(svc, FALSE);
+
 	return;
 }
 
@@ -2458,6 +2461,9 @@ void schedule_host_check(host *hst, time_t check_time, int options) {
 		log_debug_info(DEBUGL_CHECKS, 2, "Keeping original host check event (ignoring the new one).\n");
 	}
 
+	/* update next_check time for host */
+	update_host_status(hst, FALSE);
+
 	return;
 }
 





More information about the icinga-checkins mailing list