diff --git a/lib/sidekiq/limit_fetch.rb b/lib/sidekiq/limit_fetch.rb index 67d2168..a00229f 100644 --- a/lib/sidekiq/limit_fetch.rb +++ b/lib/sidekiq/limit_fetch.rb @@ -53,7 +53,7 @@ def bulk_requeue(*args) if Sidekiq::BasicFetch.respond_to?(:bulk_requeue) # < 6.1.0 Sidekiq::BasicFetch.bulk_requeue(*args) else # 6.1.0+ - Sidekiq::BasicFetch.new(config).bulk_requeue(*args) + Sidekiq::BasicFetch.new(post_7? ? Sidekiq.default_configuration.default_capsule : config).bulk_requeue(*args) end end diff --git a/lib/sidekiq/limit_fetch/queues.rb b/lib/sidekiq/limit_fetch/queues.rb index eeec7ff..7b3fa5e 100644 --- a/lib/sidekiq/limit_fetch/queues.rb +++ b/lib/sidekiq/limit_fetch/queues.rb @@ -14,8 +14,14 @@ module Queues def start(capsule_or_options) config = Sidekiq::LimitFetch.post_7? ? capsule_or_options.config : capsule_or_options - @queues = config[:queues] - @startup_queues = config[:queues].dup + @queues = config[:queues].map do |queue| + if queue.is_a? Array + queue.first + else + queue + end + end.uniq + @startup_queues = @queues.dup if config[:dynamic].is_a? Hash @dynamic = true