From: Alexander A. Klimov <alexander.klimov@icinga.com>
Date: Fri, 11 Jan 2019 17:25:12 +0000 (+0100)
Subject: Notification#BeginExecuteNotification(): SetNextNotification() correctly
X-Git-Tag: v2.10.4~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bac6f17eff0e412e9a2a689616eebf1ccd9d5414;p=icinga2

Notification#BeginExecuteNotification(): SetNextNotification() correctly

refs #5561

(cherry picked from commit 3b2054761ad90e71fba82d13cd57d7388f524993)
---

diff --git a/lib/icinga/notification.cpp b/lib/icinga/notification.cpp
index ba6ca49b4..09b5c1106 100644
--- a/lib/icinga/notification.cpp
+++ b/lib/icinga/notification.cpp
@@ -288,11 +288,9 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe
 					<< "': before specified begin time (" << Utility::FormatDuration(timesBegin) << ")";
 
 				/* we need to adjust the next notification time
-				 * to now + begin delaying the first notification
+				 * delaying the first notification
 				 */
-				double nextProposedNotification = now + timesBegin + 1.0;
-				if (GetNextNotification() > nextProposedNotification)
-					SetNextNotification(nextProposedNotification);
+				SetNextNotification(checkable->GetLastHardStateChange() + timesBegin + 1.0);
 
 				return;
 			}