github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-31 16:55:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Pubsub connections need to be killed too.

Browse Source
This commit is contained in:
Guo Xiang Tan 2016-04-07 15:28:13 +08:00
parent d6ed9848a9
commit 7f6fe8fe13
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/discourse_redis.rb
View File

@ -32,6 +32,7 @@ class DiscourseRedis
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.warn "#{log_prefix}: Master server is active, killing all connections to slave..."
slave_client.call([:client, [:kill, 'type', 'normal']]) slave_client.call([:client, [:kill, 'type', 'normal']])
slave_client.call([:client, [:kill, 'type', 'pubsub']])
Discourse.clear_readonly! Discourse.clear_readonly!
Discourse.request_refresh! Discourse.request_refresh!
@master = true @master = true

1
spec/components/discourse_redis_spec.rb
View File

@ -84,6 +84,7 @@ describe DiscourseRedis do
fallback_handler.master = false fallback_handler.master = false
Redis::Client.any_instance.expects(:call).with([:info]).returns(DiscourseRedis::FallbackHandler::MASTER_LINK_STATUS) Redis::Client.any_instance.expects(:call).with([:info]).returns(DiscourseRedis::FallbackHandler::MASTER_LINK_STATUS)
Redis::Client.any_instance.expects(:call).with([:client, [:kill, 'type', 'normal']]) Redis::Client.any_instance.expects(:call).with([:client, [:kill, 'type', 'normal']])
Redis::Client.any_instance.expects(:call).with([:client, [:kill, 'type', 'pubsub']])
fallback_handler.initiate_fallback_to_master fallback_handler.initiate_fallback_to_master