From eadf64665fa54bbb678d4e3b212ea9ed8b090e9e Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <junchao@nvidia.com>
Date: Wed, 5 Jun 2024 06:09:29 +0300
Subject: [PATCH] Add more information when connect redis fail

---
 common/dbconnector.cpp |  4 ++--
 tests/redis_ut.cpp     | 29 +++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/common/dbconnector.cpp b/common/dbconnector.cpp
index 0e044f3ea..21d1712dd 100755
--- a/common/dbconnector.cpp
+++ b/common/dbconnector.cpp
@@ -562,7 +562,7 @@ void RedisContext::initContext(const char *host, int port, const timeval *tv)
 
     if (m_conn->err)
         throw system_error(make_error_code(errc::address_not_available),
-                           "Unable to connect to redis");
+                           "Unable to connect to redis - " + std::string(m_conn->errstr) + "(" + std::to_string(m_conn->err) + ")");
 }
 
 void RedisContext::initContext(const char *path, const timeval *tv)
@@ -578,7 +578,7 @@ void RedisContext::initContext(const char *path, const timeval *tv)
 
     if (m_conn->err)
         throw system_error(make_error_code(errc::address_not_available),
-                           "Unable to connect to redis (unix-socket)");
+                           "Unable to connect to redis (unix-socket) - " + std::string(m_conn->errstr) + "(" + std::to_string(m_conn->err) + ")");
 }
 
 redisContext *RedisContext::getContext() const
diff --git a/tests/redis_ut.cpp b/tests/redis_ut.cpp
index 4f691e88a..fcf030376 100644
--- a/tests/redis_ut.cpp
+++ b/tests/redis_ut.cpp
@@ -1139,3 +1139,32 @@ TEST(Connector, hmset)
     // test empty multi hash
     db.hmset({});
 }
+
+TEST(Connector, connectFail)
+{
+    // connect to an ip which is not a redis server
+    EXPECT_THROW({
+        try
+        {
+            DBConnector db(0, "1.1.1.1", 6379, 1);
+        }
+        catch(const std::system_error& e)
+        {
+            EXPECT_THAT(e.what(), HasSubstr("Unable to connect to redis - "));
+            throw;
+        }
+    }, std::system_error);
+
+    // connect to an invalid unix socket address
+    EXPECT_THROW({
+        try
+        {
+            DBConnector db(0, "/tmp/invalid", 1);
+        }
+        catch(const std::system_error& e)
+        {
+            EXPECT_THAT(e.what() HasSubstr("Unable to connect to redis (unix-socket) - "));
+            throw;
+        }
+    }, std::system_error);
+}