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

FIX: Can't boot Discourse with a read-only PG connection.

Browse Source
This commit is contained in:
Guo Xiang Tan
2018-06-11 12:29:23 +08:00
parent b91a3c12a5
commit 5656e8f366
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,8 +17,10 @@ class PostgreSQLFallbackHandler
@initialized = false
MessageBus.subscribe(DATABASE_DOWN_CHANNEL) do |payload|
RailsMultisite::ConnectionManagement.with_connection(payload.data['db']) do
clear_connections
if @initialized
RailsMultisite::ConnectionManagement.with_connection(payload.data['db']) do
clear_connections
end
end
end
end
@ -28,14 +30,10 @@ class PostgreSQLFallbackHandler
@thread = Thread.new do
while true do
begin
thread = Thread.new { initiate_fallback_to_master }
thread.join
break if synchronize { @masters_down.hash.empty? }
sleep 10
ensure
thread.kill
end
thread = Thread.new { initiate_fallback_to_master }
thread.join
break if synchronize { @masters_down.hash.empty? }
sleep 10
end
end