From 4dbebb4915898f4e1ac6ed56d884105236f049fb Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Tue, 22 Jan 2019 12:47:16 +0800
Subject: [PATCH] Follow up to f6f2c38183826bad7e69813e0f75eb6828153584.

Master connection might fail.
---
 lib/discourse_redis.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb
index 667f8fe1886..17954eb798b 100644
--- a/lib/discourse_redis.rb
+++ b/lib/discourse_redis.rb
@@ -41,7 +41,9 @@ class DiscourseRedis
       success = false
 
       begin
-        master_client = ::Redis::Client.new(DiscourseRedis.config)
+        redis_config = DiscourseRedis.config.dup
+        redis_config.delete(:connector)
+        master_client = ::Redis::Client.new(redis_config)
         logger.warn "#{log_prefix}: Checking connection to master server..."
         info = master_client.call([:info])
 
@@ -64,6 +66,8 @@ class DiscourseRedis
             slave_client&.disconnect
           end
         end
+      rescue => e
+        logger.warn "#{log_prefix}: Connection to Master server failed with '#{e.message}'"
       ensure
         master_client&.disconnect
       end