From 1481b3420ec1fa8514a9f37ec8947d91b9642731 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 1 Apr 2016 14:23:39 +0800 Subject: [PATCH] Add more logging so that we know what is happening with Redis fallback. --- lib/discourse_redis.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb index 8f865d9ac95..c92cc9ef72c 100644 --- a/lib/discourse_redis.rb +++ b/lib/discourse_redis.rb @@ -27,8 +27,10 @@ class DiscourseRedis def initiate_fallback_to_master begin slave_client = ::Redis::Client.new(@slave_config) + logger.warn "#{log_prefix}: Checking connection to master server..." if slave_client.call([:info]).split("\r\n").include?(MASTER_LINK_STATUS) + logger.warn "#{log_prefix}: Master server is active, killing all connections to slave..." slave_client.call([:client, [:kill, 'type', 'normal']]) Discourse.clear_readonly! Discourse.request_refresh! @@ -62,6 +64,14 @@ class DiscourseRedis def synchronize @mutex.synchronize { yield } end + + def logger + Rails.logger + end + + def log_prefix + "#{self.class}" + end end class Connector < Redis::Client::Connector