Icinga DB: record ack expiries

refs #8012
This commit is contained in:
Alexander A. Klimov 2020-05-15 12:02:51 +02:00
parent d5d89b7f39
commit c4a8afbe5f

View File

@ -143,15 +143,7 @@ void Checkable::ClearAcknowledgement(const String& removedBy, double changeTime,
{ {
ObjectLock oLock (this); ObjectLock oLock (this);
bool wasAcked; bool wasAcked = GetAcknowledgementRaw() != AcknowledgementNone;
if (GetAcknowledgementRaw() == AcknowledgementNone) {
wasAcked = false;
} else {
double expiry = GetAcknowledgementExpiry();
wasAcked = expiry == 0 || expiry >= Utility::GetTime();
}
SetAcknowledgementRaw(AcknowledgementNone); SetAcknowledgementRaw(AcknowledgementNone);
SetAcknowledgementExpiry(0); SetAcknowledgementExpiry(0);