mirror of
https://github.com/discourse/discourse.git
synced 2026-08-10 21:15:25 -05:00
DEV: Make rails_failover compatible with SKIP_DB_AND_REDIS env.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
if !GlobalSetting.skip_redis?
|
||||
if defined?(RailsFailover::Redis)
|
||||
message_bus_keepalive_interval = nil
|
||||
|
||||
RailsFailover::Redis.on_failover do
|
||||
@@ -16,7 +16,7 @@ if !GlobalSetting.skip_redis?
|
||||
end
|
||||
end
|
||||
|
||||
if !GlobalSetting.skip_db?
|
||||
if defined?(RailsFailover::ActiveRecord)
|
||||
if Rails.configuration.multisite
|
||||
if ActiveRecord::Base.current_role == ActiveRecord::Base.reading_role
|
||||
RailsMultisite::ConnectionManagement.default_connection_handler =
|
||||
|
||||
@@ -24,7 +24,10 @@ if Rails.configuration.multisite
|
||||
# Multisite needs to be first, because the request tracker and message bus rely on it
|
||||
Rails.configuration.middleware.unshift RailsMultisite::Middleware, RailsMultisite::DiscoursePatches.config
|
||||
Rails.configuration.middleware.delete ActionDispatch::Executor
|
||||
Rails.configuration.middleware.insert_after(RailsMultisite::Middleware, RailsFailover::ActiveRecord::Middleware)
|
||||
else
|
||||
|
||||
if defined?(RailsFailover)
|
||||
Rails.configuration.middleware.insert_after(RailsMultisite::Middleware, RailsFailover::ActiveRecord::Middleware)
|
||||
end
|
||||
elsif defined?(RailsFailover)
|
||||
Rails.configuration.middleware.insert_before(MessageBus::Rack::Middleware, RailsFailover::ActiveRecord::Middleware)
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user