[icinga-checkins] icinga.org: icinga2/fix/api-sync-repl-11684: Change which instance is responsible for initiating notifications in a HA setup

git at icinga.org git at icinga.org
Wed Jun 15 17:50:19 CEST 2016


Module: icinga2
Branch: fix/api-sync-repl-11684
Commit: a8209c1a1a58c8dce2fb7bf74ab45553c6afc1ce
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=a8209c1a1a58c8dce2fb7bf74ab45553c6afc1ce

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Tue Jun 14 07:57:52 2016 +0200

Change which instance is responsible for initiating notifications in a HA setup

refs #9242

---

 lib/icinga/checkable-check.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp
index fc5e88e..4e64d92 100644
--- a/lib/icinga/checkable-check.cpp
+++ b/lib/icinga/checkable-check.cpp
@@ -365,7 +365,7 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
 	    (is_volatile && !(IsStateOK(old_state) && IsStateOK(new_state))))
 		ExecuteEventHandler();
 
-	if (send_downtime_notification && !origin)
+	if (send_downtime_notification && IsActive())
 		OnNotificationsRequested(this, in_downtime ? NotificationDowntimeStart : NotificationDowntimeEnd, cr, "", "", MessageOrigin::Ptr());
 
 	if (send_notification) {



More information about the icinga-checkins mailing list