From 92072981aa6b0973a9830e7d2b0dd0ce896249cb Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Tue, 22 Aug 2023 12:34:25 +0200 Subject: [PATCH] Drop ApiListener#m_RelayQueue --- lib/remote/apilistener.cpp | 7 ------- lib/remote/apilistener.hpp | 1 - 2 files changed, 8 deletions(-) diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp index 641ee150b..e8b8718d3 100644 --- a/lib/remote/apilistener.cpp +++ b/lib/remote/apilistener.cpp @@ -57,7 +57,6 @@ REGISTER_APIFUNCTION(Hello, icinga, &ApiListener::HelloAPIHandler); ApiListener::ApiListener() { - m_RelayQueue.SetName("ApiListener, RelayQueue"); m_SyncQueue.SetName("ApiListener, SyncQueue"); } @@ -1677,10 +1676,8 @@ std::pair ApiListener::GetStatus() size_t jsonRpcAnonymousClients = GetAnonymousClients().size(); size_t httpClients = GetHttpClients().size(); size_t syncQueueItems = m_SyncQueue.GetLength(); - size_t relayQueueItems = m_RelayQueue.GetLength(); double workQueueItemRate = JsonRpcConnection::GetWorkQueueRate(); double syncQueueItemRate = m_SyncQueue.GetTaskCount(60) / 60.0; - double relayQueueItemRate = m_RelayQueue.GetTaskCount(60) / 60.0; Dictionary::Ptr status = new Dictionary({ { "identity", GetIdentity() }, @@ -1695,10 +1692,8 @@ std::pair ApiListener::GetStatus() { "json_rpc", new Dictionary({ { "anonymous_clients", jsonRpcAnonymousClients }, { "sync_queue_items", syncQueueItems }, - { "relay_queue_items", relayQueueItems }, { "work_queue_item_rate", workQueueItemRate }, { "sync_queue_item_rate", syncQueueItemRate }, - { "relay_queue_item_rate", relayQueueItemRate } }) }, { "http", new Dictionary({ @@ -1714,11 +1709,9 @@ std::pair ApiListener::GetStatus() perfdata->Set("num_json_rpc_anonymous_clients", jsonRpcAnonymousClients); perfdata->Set("num_http_clients", httpClients); perfdata->Set("num_json_rpc_sync_queue_items", syncQueueItems); - perfdata->Set("num_json_rpc_relay_queue_items", relayQueueItems); perfdata->Set("num_json_rpc_work_queue_item_rate", workQueueItemRate); perfdata->Set("num_json_rpc_sync_queue_item_rate", syncQueueItemRate); - perfdata->Set("num_json_rpc_relay_queue_item_rate", relayQueueItemRate); return std::make_pair(status, perfdata); } diff --git a/lib/remote/apilistener.hpp b/lib/remote/apilistener.hpp index eae1fa03e..a971f3ac0 100644 --- a/lib/remote/apilistener.hpp +++ b/lib/remote/apilistener.hpp @@ -199,7 +199,6 @@ private: ); void ListenerCoroutineProc(boost::asio::yield_context yc, const Shared::Ptr& server); - WorkQueue m_RelayQueue; WorkQueue m_SyncQueue{0, 4}; std::mutex m_LogLock;