From dd5289bf4eda00ddcd96d501738ca7f63ad74297 Mon Sep 17 00:00:00 2001 From: Yonas Habteab Date: Thu, 16 Oct 2025 16:12:08 +0200 Subject: [PATCH] RedisConnection: drop superfluous `GetConnected` method --- lib/icingadb/icingadbchecktask.cpp | 2 +- lib/icingadb/redisconnection.cpp | 4 ---- lib/icingadb/redisconnection.hpp | 10 ++++------ 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/lib/icingadb/icingadbchecktask.cpp b/lib/icingadb/icingadbchecktask.cpp index 5c8f47f8c..e884c22c4 100644 --- a/lib/icingadb/icingadbchecktask.cpp +++ b/lib/icingadb/icingadbchecktask.cpp @@ -101,7 +101,7 @@ void IcingadbCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckR auto redis (conn->GetConnection()); - if (!redis || !redis->GetConnected()) { + if (!redis || !redis->IsConnected()) { ReportIcingadbCheck(checkable, commandObj, cr, producer, "Icinga DB CRITICAL: Not connected to Redis.", ServiceCritical); return; } diff --git a/lib/icingadb/redisconnection.cpp b/lib/icingadb/redisconnection.cpp index 8763b0113..0cbcb2368 100644 --- a/lib/icingadb/redisconnection.cpp +++ b/lib/icingadb/redisconnection.cpp @@ -86,10 +86,6 @@ void RedisConnection::Start() } } -bool RedisConnection::IsConnected() { - return m_Connected.load(); -} - /** * Append a Redis query to a log message * diff --git a/lib/icingadb/redisconnection.hpp b/lib/icingadb/redisconnection.hpp index 6daa5deb2..ecc9251e6 100644 --- a/lib/icingadb/redisconnection.hpp +++ b/lib/icingadb/redisconnection.hpp @@ -119,7 +119,10 @@ struct RedisConnInfo final : SharedObject void Start(); - bool IsConnected(); + bool IsConnected() const + { + return m_Connected.load(); + } void FireAndForgetQuery(Query query, QueryPriority priority, QueryAffects affects = {}); void FireAndForgetQueries(Queries queries, QueryPriority priority, QueryAffects affects = {}); @@ -136,11 +139,6 @@ struct RedisConnInfo final : SharedObject void SetConnectedCallback(std::function callback); - inline bool GetConnected() - { - return m_Connected.load(); - } - int GetQueryCount(RingBuffer::SizeType span); inline int GetPendingQueryCount() const