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

Fix rebase against master branch

This commit is contained in:
Michael Friedrich 2019-11-02 14:18:20 +01:00
parent 61d9130dd0
commit 9235246985
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/icingadb/icingadb-objects.cpp
View File

@ -1494,6 +1494,16 @@ void IcingaDB::SendRemovedComment(const Comment::Ptr& comment)
xAdd.emplace_back(GetObjectIdentifier(endpoint));
}
if (comment->GetExpireTime() < Utility::GetTime()) {
xAdd.emplace_back("remove_time");
xAdd.emplace_back(Convert::ToString(TimestampToMilliseconds(Utility::GetTime())));
xAdd.emplace_back("has_been_removed");
xAdd.emplace_back("1");
} else {
xAdd.emplace_back("has_been_removed");
xAdd.emplace_back("0");
}
m_Rcon->FireAndForgetQuery(std::move(xAdd));
}
@ -1534,16 +1544,6 @@ void IcingaDB::SendFlappingChanged(const Checkable::Ptr& checkable, const Value&
xAdd.emplace_back("endpoint_id");
xAdd.emplace_back(GetObjectIdentifier(endpoint));
}
if (comment->GetExpireTime() < Utility::GetTime()) {
xAdd.emplace_back("remove_time");
xAdd.emplace_back(Convert::ToString(TimestampToMilliseconds(Utility::GetTime())));
xAdd.emplace_back("has_been_removed");
xAdd.emplace_back("1");
} else {
xAdd.emplace_back("has_been_removed");
xAdd.emplace_back("0");
}
m_Rcon->FireAndForgetQuery(std::move(xAdd));
}