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

DEV: Bump rails_failover.

Browse Source 
Avoid configuring AR stuff if `replica_host` and `replica_port` hasn't
been provided.
This commit is contained in:
Guo Xiang Tan
2020-06-16 10:51:21 +08:00
parent a2713578dd
commit 092ae858af
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.lock
View File

@ -280,7 +280,7 @@ GEM
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0) rails-html-sanitizer (1.3.0)
loofah (~> 2.3) loofah (~> 2.3)
rails_failover (0.5.0) rails_failover (0.5.1)
activerecord (~> 6.0) activerecord (~> 6.0)
railties (~> 6.0) railties (~> 6.0)
rails_multisite (2.3.0) rails_multisite (2.3.0)

2
config/initializers/002-rails_failover.rb
View File

@ -1,5 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
return unless Rails.configuration.active_record_rails_failover
if defined?(RailsFailover::Redis) if defined?(RailsFailover::Redis)
message_bus_keepalive_interval = nil message_bus_keepalive_interval = nil

4
config/initializers/200-first_middlewares.rb
View File

@ -25,9 +25,9 @@ if Rails.configuration.multisite
Rails.configuration.middleware.unshift RailsMultisite::Middleware, RailsMultisite::DiscoursePatches.config Rails.configuration.middleware.unshift RailsMultisite::Middleware, RailsMultisite::DiscoursePatches.config
Rails.configuration.middleware.delete ActionDispatch::Executor Rails.configuration.middleware.delete ActionDispatch::Executor
if defined?(RailsFailover) if defined?(RailsFailover) && Rails.configuration.active_record_rails_failover
Rails.configuration.middleware.insert_after(RailsMultisite::Middleware, RailsFailover::ActiveRecord::Middleware) Rails.configuration.middleware.insert_after(RailsMultisite::Middleware, RailsFailover::ActiveRecord::Middleware)
end end
elsif defined?(RailsFailover) elsif defined?(RailsFailover) && Rails.configuration.active_record_rails_failover
Rails.configuration.middleware.insert_before(MessageBus::Rack::Middleware, RailsFailover::ActiveRecord::Middleware) Rails.configuration.middleware.insert_before(MessageBus::Rack::Middleware, RailsFailover::ActiveRecord::Middleware)
end end