From 923524698517b95d9cc7a7a1d4f92ca58519da07 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Sat, 2 Nov 2019 14:18:20 +0100 Subject: [PATCH] Fix rebase against master branch --- lib/icingadb/icingadb-objects.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/icingadb/icingadb-objects.cpp b/lib/icingadb/icingadb-objects.cpp index 877c99b9d..d92eb8fd8 100644 --- a/lib/icingadb/icingadb-objects.cpp +++ b/lib/icingadb/icingadb-objects.cpp @@ -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)); }