From 3b2054761ad90e71fba82d13cd57d7388f524993 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Fri, 11 Jan 2019 18:25:12 +0100 Subject: [PATCH] Notification#BeginExecuteNotification(): SetNextNotification() correctly refs #5561 --- lib/icinga/notification.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/icinga/notification.cpp b/lib/icinga/notification.cpp index ba6ca49b4d2..09b5c11062b 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; }