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

DEV: Make rails_failover compatible with SKIP_DB_AND_REDIS env.

Browse Source
This commit is contained in:
Guo Xiang Tan
2020-06-15 16:23:24 +08:00
parent e0d798c06c
commit 402b80f306
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/global_setting.rb
View File

@ -163,7 +163,7 @@ class GlobalSetting
c[:host] = redis_host if redis_host c[:host] = redis_host if redis_host
c[:port] = redis_port if redis_port c[:port] = redis_port if redis_port
if redis_slave_host && redis_slave_port if redis_slave_host && redis_slave_port && defined?(RailsFailover)
c[:replica_host] = redis_slave_host c[:replica_host] = redis_slave_host
c[:replica_port] = redis_slave_port c[:replica_port] = redis_slave_port
c[:connector] = RailsFailover::Redis::Connector c[:connector] = RailsFailover::Redis::Connector

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

@ -1,6 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
if !GlobalSetting.skip_redis? if defined?(RailsFailover::Redis)
message_bus_keepalive_interval = nil message_bus_keepalive_interval = nil
RailsFailover::Redis.on_failover do RailsFailover::Redis.on_failover do
@ -16,7 +16,7 @@ if !GlobalSetting.skip_redis?
end end
end end
if !GlobalSetting.skip_db? if defined?(RailsFailover::ActiveRecord)
if Rails.configuration.multisite if Rails.configuration.multisite
if ActiveRecord::Base.current_role == ActiveRecord::Base.reading_role if ActiveRecord::Base.current_role == ActiveRecord::Base.reading_role
RailsMultisite::ConnectionManagement.default_connection_handler = RailsMultisite::ConnectionManagement.default_connection_handler =

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

@ -24,7 +24,10 @@ if Rails.configuration.multisite
# Multisite needs to be first, because the request tracker and message bus rely on it # 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.unshift RailsMultisite::Middleware, RailsMultisite::DiscoursePatches.config
Rails.configuration.middleware.delete ActionDispatch::Executor 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) Rails.configuration.middleware.insert_before(MessageBus::Rack::Middleware, RailsFailover::ActiveRecord::Middleware)
end end