Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #37444 - get rid of sidekiq deprecation warnings #10164

Merged
merged 1 commit into from
May 14, 2024
Merged

Fixes #37444 - get rid of sidekiq deprecation warnings #10164

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions extras/dynflow-sidekiq.rb
View file
Open in desktop
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
Loading