tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug fix for reminder notifications.

This commit is contained in:
Gunnar Beutner 2013-03-21 15:24:00 +01:00
parent db064d3ce9
commit f5c77463b1
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/notification/notificationcomponent.cpp
View File

@ -78,6 +78,8 @@ void NotificationComponent::NotificationTimerHandler(void)
Service::Ptr service = notification->GetService(); Service::Ptr service = notification->GetService();
bool reachable = service->IsReachable(); bool reachable = service->IsReachable();
notification->SetNextNotification(Utility::GetTime() + notification->GetNotificationInterval());
bool send_notification; bool send_notification;
{ {
@ -89,13 +91,9 @@ void NotificationComponent::NotificationTimerHandler(void)
if (service->GetState() == StateOK) if (service->GetState() == StateOK)
continue; continue;
send_notification = reachable && !service->IsInDowntime() && !service->IsAcknowledged(); if (!reachable || service->IsInDowntime() || service->IsAcknowledged())
}
notification->SetNextNotification(Utility::GetTime() + notification->GetNotificationInterval());
if (!send_notification)
continue; continue;
}
try { try {
Log(LogInformation, "notification", "Sending reminder notification for service '" + service->GetName() + "'"); Log(LogInformation, "notification", "Sending reminder notification for service '" + service->GetName() + "'");