diff --git a/Gemfile.lock b/Gemfile.lock index e7febbb3ff8..baa304a8ecd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,9 @@ GIT remote: https://github.com/discourse/rails_failover - revision: a8785298ad5c89869c315d53d5f7243ec9443b55 + revision: e9893a3920809c9a1bca4f7ae07b7243b2cd127e specs: rails_failover (0.4.0) activerecord (~> 6.0) - listen (~> 3.2) railties (~> 6.0) GEM diff --git a/config/initializers/002-rails_failover.rb b/config/initializers/002-rails_failover.rb index 5b65d579f19..570248c7481 100644 --- a/config/initializers/002-rails_failover.rb +++ b/config/initializers/002-rails_failover.rb @@ -25,7 +25,7 @@ if ENV["ACTIVE_RECORD_RAILS_FAILOVER"] Discourse.disable_readonly_mode(Discourse::PG_READONLY_MODE_KEY) end - Sidekiq.unpause! + Sidekiq.unpause! if Sidekiq.pause? end module Discourse diff --git a/lib/discourse.rb b/lib/discourse.rb index 5da2acb15e9..c46d91e3625 100644 --- a/lib/discourse.rb +++ b/lib/discourse.rb @@ -661,10 +661,6 @@ module Discourse # re-establish Sidekiq.redis = sidekiq_redis_config - if ENV['ACTIVE_RECORD_RAILS_FAILOVER'] - RailsFailover::ActiveRecord.after_fork - end - # in case v8 was initialized we want to make sure it is nil PrettyText.reset_context