From dd4cab3be2ddc099d6cef438ac4243ee209f7f0e Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Wed, 23 Nov 2016 14:04:43 +0800
Subject: [PATCH] FIX: Set master to true before forcing slave connections to
 reconnect.

---
 lib/discourse_redis.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb
index 91bbd1a36c7..aaa5f74ef76 100644
--- a/lib/discourse_redis.rb
+++ b/lib/discourse_redis.rb
@@ -35,13 +35,14 @@ class DiscourseRedis
         if slave_client.call([:info]).split("\r\n").include?(MASTER_LINK_STATUS)
           logger.info "#{log_prefix}: Master server is active, killing all connections to slave..."
 
+          self.master = true
+
           CONNECTION_TYPES.each do |connection_type|
             slave_client.call([:client, [:kill, 'type', connection_type]])
           end
 
           Discourse.clear_readonly!
           Discourse.request_refresh!
-          self.master = true
           success = true
         end
       ensure