Skip to content

Commit

Permalink
Fixes #37444 - get rid of sidekiq deprecation warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
sbernhard committed May 14, 2024
1 parent 4907a96 commit bf66644
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions extras/dynflow-sidekiq.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
rails_env_file = File.expand_path('./config/environment.rb', rails_root)
require rails_env_file

if Sidekiq.options[:queues].include?("dynflow_orchestrator")
Sidekiq.options[:dynflow_executor] = true
if Sidekiq[:queues].include?("dynflow_orchestrator")
Sidekiq[:dynflow_executor] = true
::Rails.application.dynflow.executor!
elsif (Sidekiq.options[:queues] - ['dynflow_orchestrator']).any?
elsif (Sidekiq[:queues] - ['dynflow_orchestrator']).any?
::Rails.application.dynflow.config.remote = true
end

::Rails.application.dynflow.config.on_init(false) do |world|
Sidekiq.options[:dynflow_world] = world
Sidekiq[:dynflow_world] = world
end

# To be able to ensure ordering, dynflow requires that there is only one
Expand All @@ -33,7 +33,7 @@
# dynflow.initialize! block until the lock is acquired by the current process.
# To play nice with sd_notify, we need to mark the process as ready before it
# attempts to acquire the lock.
if Sidekiq.options[:dynflow_executor]
if Sidekiq[:dynflow_executor]
msg = 'orchestrator in passive mode'
Rails.logger.info(msg)
Sidekiq::SdNotify.status(msg)
Expand Down

0 comments on commit bf66644

Please sign in to comment.