DEV: Don't configure rails_failover is db and redis is skipped.

This commit is contained in:
Guo Xiang Tan 2020-06-15 15:56:57 +08:00
parent 58e52c0e4f
commit e0fdf41537
No known key found for this signature in database
GPG Key ID: FBD110179AAC1F20
2 changed files with 53 additions and 43 deletions

View File

@ -19,8 +19,14 @@ require 'action_controller/railtie'
require 'action_view/railtie'
require 'action_mailer/railtie'
require 'sprockets/railtie'
if !GlobalSetting.skip_db
require 'rails_failover/active_record'
end
if !GlobalSetting.skip_redis
require 'rails_failover/redis'
end
# Plugin related stuff
require_relative '../lib/plugin_initialization_guard'

View File

@ -1,5 +1,6 @@
# frozen_string_literal: true
if !GlobalSetting.skip_redis
message_bus_keepalive_interval = nil
RailsFailover::Redis.on_failover do
@ -13,7 +14,9 @@ RailsFailover::Redis.on_fallback do
Discourse.request_refresh!
MessageBus.keepalive_interval = message_bus_keepalive_interval
end
end
if !GlobalSetting.skip_db
if Rails.configuration.multisite
if ActiveRecord::Base.current_role == ActiveRecord::Base.reading_role
RailsMultisite::ConnectionManagement.default_connection_handler =
@ -49,3 +52,4 @@ rescue => e
Rails.logger.warn "#{e.class} #{e.message}: #{e.backtrace.join("\n")}"
false
end
end