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

View File

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