codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-02-25 07:54:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Internally AR::Base.establish_connection removes the current connection.

Browse source
This commit is contained in:
Guo Xiang Tan 2016-02-04 11:06:02 +08:00
parent a08496bb1a
commit c532d7d1ae
2 changed files with 19 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
View file

@ -24,7 +24,6 @@ class PostgreSQLFallbackHandler
if connection.active?
logger.info "#{self.class}: Master server is active. Reconnecting..."
ActiveRecord::Base.remove_connection
ActiveRecord::Base.establish_connection(config)
Discourse.disable_readonly_mode
@master = true

5
spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb
View file

@ -27,7 +27,6 @@ describe ActiveRecord::ConnectionHandling do
end
it 'should failover to a replica server' do
begin
ActiveRecord::Base.expects(:postgresql_connection).with(config).raises(PG::ConnectionBad)
ActiveRecord::Base.expects(:verify_replica).with(@replica_connection)
@ -57,10 +56,6 @@ describe ActiveRecord::ConnectionHandling do
expect(ActiveRecord::Base.connection)
.to be_an_instance_of(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
ensure
# threads.each { |t| Thread.kill(t) } if threads
ActiveRecord::Base.establish_connection(:test)
end
end
end