From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Tue, 14 Jun 2016 05:57:52 +0000 (+0200)
Subject: Change which instance is responsible for initiating notifications in a HA setup
X-Git-Tag: v2.5.0~268
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8209c1a1a58c8dce2fb7bf74ab45553c6afc1ce;p=icinga2

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

refs #9242
---

diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp
index fc5e88e8d..4e64d9256 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) {