github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 07:53:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

correct erratically failing spec

Browse Source
This commit is contained in:
Sam
2017-08-18 15:10:37 -04:00
parent d65570a8a1
commit aeedecd27c
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/discourse_redis.rb
View File

@ -99,7 +99,7 @@ class DiscourseRedis
@fallback_handler = DiscourseRedis::FallbackHandler.instance
end
def resolve
def resolve(client = nil)
if !@fallback_handler.master
@fallback_handler.verify_master unless @fallback_handler.running?
return @slave_options
@ -108,7 +108,7 @@ class DiscourseRedis
begin
options = @options.dup
options.delete(:connector)
client = Redis::Client.new(options)
client ||= Redis::Client.new(options)
loading = client.call([:info]).split("\r\n").include?("loading:1")
loading ? @slave_options : @options
rescue Redis::ConnectionError, Redis::CannotConnectError, RuntimeError => ex