Merge branch 'next-minor' into develop

This commit is contained in:
Jonne Haß 2021-04-11 20:50:31 +02:00
commit 69c6305e62

View file

@ -19,13 +19,9 @@ before_fork do |_server, _worker|
ActiveRecord::Base.connection.disconnect! # preloading app in master, so reconnect to DB
# disconnect redis if in use
unless AppConfig.environment.single_process_mode?
Sidekiq.redis {|redis| redis.client.disconnect }
end
Sidekiq.redis(&:close) unless AppConfig.environment.single_process_mode?
if AppConfig.server.embed_sidekiq_worker?
@sidekiq_pid ||= spawn("bin/bundle exec sidekiq")
end
@sidekiq_pid ||= spawn("bin/bundle exec sidekiq") if AppConfig.server.embed_sidekiq_worker?
end
after_fork do |server, worker|