tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-24 22:24:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6896 from Icinga/bugfix/notification-delay-5561

Browse Source 
Notification#BeginExecuteNotification(): SetNextNotification() correctly
This commit is contained in:
Michael Friedrich 2019-02-22 09:27:59 +01:00 committed by GitHub
commit 30d98b49eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/icinga/notification.cpp
View File

@ -290,11 +290,9 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe
<< notificationName << "': before specified begin time (" << Utility::FormatDuration(timesBegin) << ")"; << notificationName << "': before specified begin time (" << Utility::FormatDuration(timesBegin) << ")";
/* we need to adjust the next notification time /* 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; SetNextNotification(checkable->GetLastHardStateChange() + timesBegin + 1.0);
if (GetNextNotification() > nextProposedNotification)
SetNextNotification(nextProposedNotification);
return; return;
} }