From 54d555bd92f222187acadcce71c8fb63342bb70f Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Wed, 4 Mar 2020 11:24:07 +0100 Subject: [PATCH] Drop IcingaDB#SendEvent() --- lib/icingadb/icingadb.cpp | 24 ------------------------ lib/icingadb/icingadb.hpp | 1 - 2 files changed, 25 deletions(-) diff --git a/lib/icingadb/icingadb.cpp b/lib/icingadb/icingadb.cpp index bae78cbc7..8dc49e6fa 100644 --- a/lib/icingadb/icingadb.cpp +++ b/lib/icingadb/icingadb.cpp @@ -176,36 +176,12 @@ void IcingaDB::HandleEvents() if (!event) continue; - - m_WorkQueue.Enqueue([this, event]() { SendEvent(event); }); } queue->RemoveClient(this); EventQueue::UnregisterIfUnused(queueName, queue); } -void IcingaDB::SendEvent(const Dictionary::Ptr& event) -{ - AssertOnWorkQueue(); - - if (!m_Rcon || !m_Rcon->IsConnected()) - return; - - String type = event->Get("type"); - - if (type.Contains("Acknowledgement")) { - Checkable::Ptr checkable; - - if (event->Contains("service")) { - checkable = Service::GetByNamePair(event->Get("host"), event->Get("service")); - event->Set("service_id", GetObjectIdentifier(checkable)); - } else { - checkable = Host::GetByName(event->Get("host")); - event->Set("host_id", GetObjectIdentifier(checkable)); - } - } -} - void IcingaDB::Stop(bool runtimeRemoved) { Log(LogInformation, "IcingaDB") diff --git a/lib/icingadb/icingadb.hpp b/lib/icingadb/icingadb.hpp index 8f40a273e..ff826a48c 100644 --- a/lib/icingadb/icingadb.hpp +++ b/lib/icingadb/icingadb.hpp @@ -38,7 +38,6 @@ private: void ReconnectTimerHandler(); void TryToReconnect(); void HandleEvents(); - void SendEvent(const Dictionary::Ptr& event); void PublishStatsTimerHandler(); void PublishStats();