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

FIX: Incorrect subscription in PostgreSQLFallbackHandler.

Browse Source
This commit is contained in:
Guo Xiang Tan
2019-01-21 17:36:56 +08:00
parent c5dd4bf5dc
commit 426907cb88
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
View File

@ -16,8 +16,8 @@ class PostgreSQLFallbackHandler
@mutex = Mutex.new @mutex = Mutex.new
@initialized = false @initialized = false
MessageBus.subscribe(DATABASE_DOWN_CHANNEL) do |payload, pid| MessageBus.subscribe(DATABASE_DOWN_CHANNEL) do |payload|
if @initialized && pid != Process.pid if @initialized && payload.data["pid"].to_i != Process.pid
begin begin
RailsMultisite::ConnectionManagement.with_connection(payload.data['db']) do RailsMultisite::ConnectionManagement.with_connection(payload.data['db']) do
clear_connections clear_connections

1
spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb
View File

@ -81,6 +81,7 @@ describe ActiveRecord::ConnectionHandling do
end.first end.first
expect(message.data[:db]).to eq('default') expect(message.data[:db]).to eq('default')
expect(message.data[:pid]).to eq(Process.pid)
expect { ActiveRecord::Base.postgresql_fallback_connection(config) } expect { ActiveRecord::Base.postgresql_fallback_connection(config) }
.to change { Discourse.readonly_mode? }.from(false).to(true) .to change { Discourse.readonly_mode? }.from(false).to(true)