dynflow 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3701c362bc17e7586355538e6a469acbb09a6fc88c3f131de41efb6238767ea
-  data.tar.gz: 6dd66b68d8d6a3ce55badad2d898dac52d1dc1d3451e2b0ba93f70e201bf3c4b
+  metadata.gz: d4db626bf7deb1705c684ec0a1e4a0f55326129f94513076d0bd6eda7a8b61e7
+  data.tar.gz: 006b0a3e56c17c8c827f7375e761d1f47608b586d5fdbaaa3a16bc220b8879d6
 SHA512:
-  metadata.gz: c9984e6831e5a1e6a17e6c8b64b09d026d2c7d81c3d75d5a19963d8246ddef47f54358c8f2c824312328af25712e79c582fb6a0511b615f0a20c3e4fdce49e73
-  data.tar.gz: 32eaf38d89b5c9f59ac7ddc464a629cbe8a4e0383fb5582cc2a6bd7ccd184bc76b5d5d493b27cec9b9125dc90e56f3641fce5239167d7c69f6ac0bd9b0574c36
+  metadata.gz: 8cb9a7044648545e5da5f1be5452d3170a1be2077207ccc83b85c2fd59523851bbe4a2e3cdef484cf6f02c41b82357373de11c4d41b7fb13802be0d1a49aa2c7
+  data.tar.gz: 91cb66bfddeb1044c52f2959d7c1d3f3e4ff4bf5b44dfa938ae1d48d07650e6a6c9169f9db6ab73ba0bf79d9bd0ce41235c6b1aecedc322a56f784466fa4bc05

data/examples/remote_executor.rb

@@ -168,10 +168,11 @@ elsif defined?(Sidekiq)
   Sidekiq.default_worker_options = { :retry => 0, 'backtrace' => true }
   # assuming the remote executor was required as part of initialization
   # of the ActiveJob worker
-  world = if Sidekiq.options[:queues].include?("dynflow_orchestrator")
+  queues = Sidekiq.configure_server { |c| c.options[:queues] }
+  world = if queues.include?("dynflow_orchestrator")
             RemoteExecutorExample.initialize_sidekiq_orchestrator
-          elsif (Sidekiq.options[:queues] - ['dynflow_orchestrator']).any?
+          elsif (queues - ['dynflow_orchestrator']).any?
             RemoteExecutorExample.initialize_sidekiq_worker
           end
-  Sidekiq.options[:dynflow_world] = world
+  Sidekiq.configure_server { |c| c.options[:dynflow_world] = world }
 end

data/lib/dynflow/executors/sidekiq/core.rb

@@ -9,7 +9,7 @@ require 'sidekiq-reliable-fetch'
 Sidekiq.configure_server do |config|
   # Use semi-reliable fetch
   # for details see https://gitlab.com/gitlab-org/sidekiq-reliable-fetch/blob/master/README.md
-  config.options[:semi_reliable_fetch] = true
+  config[:semi_reliable_fetch] = true
   Sidekiq::ReliableFetch.setup_reliable_fetch!(config)
 end
 

data/lib/dynflow/rails/configuration.rb

@@ -100,7 +100,7 @@ module Dynflow
       end
 
       def sidekiq_worker?
-        defined?(::Sidekiq) && ::Sidekiq.options[:queues].any?
+        defined?(::Sidekiq) && ::Sidekiq.configure_server { |c| c[:queues].any? }
       end
 
       def calculate_db_pool_size(world)
@@ -108,7 +108,7 @@ module Dynflow
 
         base_value = 5
         if defined?(::Sidekiq)
-          Sidekiq.options[:concurrency] + base_value
+          Sidekiq.configure_server { |c| c[:concurrency] } + base_value
         else
           world.config.queues.values.inject(base_value) do |pool_size, pool_options|
             pool_size += pool_options[:pool_size]
@@ -152,7 +152,7 @@ module Dynflow
           # we can't do any operation until the Rails.application.dynflow.world is set
           config.auto_execute        = false
           config.auto_validity_check = false
-          if sidekiq_worker? && !Sidekiq.options[:queues].include?("dynflow_orchestrator")
+          if sidekiq_worker? && !Sidekiq.configure_server { |c| c[:queues].include?("dynflow_orchestrator") }
             config.delayed_executor = nil
           end
         end
@@ -192,7 +192,7 @@ module Dynflow
         if remote?
           false
         else
-          if defined?(::Sidekiq) && Sidekiq.options[:dynflow_executor]
+          if defined?(::Sidekiq) && Sidekiq.configure_server { |c| c[:dynflow_executor] }
             ::Dynflow::Executors::Sidekiq::Core
           else
             ::Dynflow::Executors::Parallel::Core

data/lib/dynflow/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Dynflow
-  VERSION = '1.8.1'
+  VERSION = '1.8.2'
 end

data/lib/dynflow.rb

@@ -25,7 +25,7 @@ module Dynflow
     # @return [Dynflow::World, nil]
     def process_world
       return @process_world if defined? @process_world
-      @process_world = Sidekiq.options[:dynflow_world]
+      @process_world = Sidekiq.configure_server { |c| c.options[:dynflow_world] }
       raise "process world is not set" unless @process_world
       @process_world
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Ivan Necas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-13 00:00:00.000000000 Z
+date: 2023-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json