Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4373 from mpalmer/quieter-redis-failover 

Failover messages really aren't warnings
This commit is contained in:
Matt Palmer 2016-08-08 16:06:51 +10:00 committed by GitHub
parent 02d63d5bc6 aa56100660
commit 5e3932d404
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/discourse_redis.rb
View File

@ -28,10 +28,10 @@ class DiscourseRedis
def initiate_fallback_to_master def initiate_fallback_to_master
begin begin
slave_client = ::Redis::Client.new(@slave_config) slave_client = ::Redis::Client.new(@slave_config)
logger.warn "#{log_prefix}: Checking connection to master server..." logger.info "#{log_prefix}: Checking connection to master server..."
if slave_client.call([:info]).split("\r\n").include?(MASTER_LINK_STATUS) 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..." logger.info "#{log_prefix}: Master server is active, killing all connections to slave..."
CONNECTION_TYPES.each do |connection_type| CONNECTION_TYPES.each do |connection_type|
slave_client.call([:client, [:kill, 'type', connection_type]]) slave_client.call([:client, [:kill, 'type', connection_type]])