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

FIX: Make sure Redis fallback don't fall into a permanent readonly state.

Browse Source
This commit is contained in:
Guo Xiang Tan
2016-11-23 11:29:28 +08:00
parent bfd0418f07
commit 02025207d5
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/discourse_redis.rb
View File

@ -60,7 +60,7 @@ class DiscourseRedis
end
def running?
synchronize { @timer_task.running? }
@timer_task.running?
end
private
@ -92,7 +92,10 @@ class DiscourseRedis
end
def resolve
return @slave_options if !@fallback_handler.master
if !@fallback_handler.master
@fallback_handler.verify_master unless @fallback_handler.running?
return @slave_options
end
begin
options = @options.dup