fixes #11534
fixes #11559
}
BOOST_FOREACH(const Comment::Ptr& comment, comments) {
- if (comment->IsExpired())
+ if (comment->IsActive() && comment->IsExpired())
RemoveComment(comment->GetName());
}
}
}
BOOST_FOREACH(const Downtime::Ptr& downtime, downtimes) {
- if (downtime->IsExpired())
+ if (downtime->IsActive() && downtime->IsExpired())
RemoveDowntime(downtime->GetName(), false, true);
}
}
double now = Utility::GetTime();
BOOST_FOREACH(const Notification::Ptr& notification, ConfigType::GetObjectsByType<Notification>()) {
+ if (!notification->IsActive())
+ continue;
+
Checkable::Ptr checkable = notification->GetCheckable();
if (checkable->IsPaused() && GetEnableHA())