sidekiq-throttled 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6112ba7b54891bb2026f3e01a299c61d063b4f7efae86ace8c189606ca9ecabf
-  data.tar.gz: 01e999a1093465e5ef702b4553215e1371b86c6dc024b2218b40988ad388ec91
+  metadata.gz: 2b1f0237b14be26ff2b25aeaedd80e4029610cfa7c2be331827c5b865c338f48
+  data.tar.gz: 3a5be191a1f02b2ce21b766be820201b6f4d06b74323456412096a0beef38d11
 SHA512:
-  metadata.gz: ba63bb6792f530028d937f629afc3e64be80fa03be250f986e1172af76b826ffbf5c23f43424f919ee83fd5d6d6b76f50589bfc656f642440b75c9c5f94b9aa8
-  data.tar.gz: b4df934846e581d6f06aee42f24142c556972a30b5b063906b86f01bc74f046b78520a30b5ca68770eac92849f60636bf55515eb7d928437cb3e1354e48815a3
+  metadata.gz: e9da0e99d328b6825ab3f47e1ea94c255717a01d05e28c90399aaf826a8d43a0e10de82baee329ddd8d846ac4e4ff0cb6f09ef11277fef2143972c50b2c3a55b
+  data.tar.gz: d73d011be01f319460fe87fda608aea9550e1f560bf778dfd5628874f0f074fc2020ad5e2f36ec8413a349c6dcd620f7aaa84a48f15e59dab8bf508e3e769354

data/Appraisals

@@ -15,3 +15,7 @@ end
 appraise "sidekiq-6.0" do
   gem "sidekiq", "~> 6.0.0"
 end
+
+appraise "sidekiq-6.1" do
+  gem "sidekiq", "~> 6.1.0"
+end

data/CHANGES.md

@@ -1,3 +1,9 @@
+## 0.13.0 (2020-07-28)
+
+* [#85](https://github.com/sensortower/sidekiq-throttled/pull/85)
+  Add Sidekiq 6.1+ support.
+  ([@hmaack])
+
 ## 0.12.0 (2020-06-22)
 
 * [#80](https://github.com/sensortower/sidekiq-throttled/pull/80)
@@ -214,3 +220,4 @@
 [@ogins57]: https://github.com/ogins57
 [@lenon]: https://github.com/lenon
 [@vaot]: https://github.com/vaot
+[@hmaack]: https://github.com/hmaack

data/README.md

@@ -235,6 +235,7 @@ This library aims to support work with following [Sidekiq][sidekiq] versions:
 * Sidekiq 5.1.x
 * Sidekiq 5.2.x
 * Sidekiq 6.0.x
+* Sidekiq 6.1.x
 
 
 ## Contributing

data/gemfiles/sidekiq_6.1.gemfile

@@ -0,0 +1,31 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rake"
+gem "rspec"
+gem "rubocop", "~> 0.82.0", require: false
+gem "rubocop-performance", "~>1.5.2", require: false
+gem "rubocop-rspec", "~> 1.39.0", require: false
+gem "sidekiq", "~> 6.1.0"
+
+group :development do
+  gem "byebug"
+  gem "guard", require: false
+  gem "guard-rspec", require: false
+  gem "guard-rubocop", require: false
+end
+
+group :test do
+  gem "apparition"
+  gem "capybara"
+  gem "coveralls", require: false
+  gem "puma"
+  gem "rack-test"
+  gem "simplecov"
+  gem "sinatra"
+  gem "timecop"
+end
+
+gemspec path: "../"

data/lib/sidekiq/throttled.rb

@@ -61,8 +61,7 @@ module Sidekiq
         QueuesPauser.instance.setup!
 
         Sidekiq.configure_server do |config|
-          require "sidekiq/throttled/fetch"
-          Sidekiq.options[:fetch] = Sidekiq::Throttled::Fetch
+          setup_strategy!
 
           require "sidekiq/throttled/middleware"
           config.server_middleware do |chain|
@@ -93,6 +92,19 @@ module Sidekiq
 
       private
 
+      # @return [void]
+      def setup_strategy!
+        require "sidekiq/throttled/fetch"
+
+        # https://github.com/mperham/sidekiq/commit/fce05c9d4b4c0411c982078a4cf3a63f20f739bc
+        Sidekiq.options[:fetch] =
+          if Gem::Version.new(Sidekiq::VERSION) < Gem::Version.new("6.1.0")
+            Sidekiq::Throttled::Fetch
+          else
+            Sidekiq::Throttled::Fetch.new(Sidekiq.options)
+          end
+      end
+
       # Tries to preload constant by it's name once.
       #
       # Somehow, sometimes, some classes are not eager loaded upon Rails init,

data/lib/sidekiq/throttled/fetch.rb

@@ -12,6 +12,29 @@ module Sidekiq
     #
     # @private
     class Fetch
+      module BulkRequeue
+        # Requeues all given units as a single operation.
+        #
+        # @see http://www.rubydoc.info/github/redis/redis-rb/master/Redis#pipelined-instance_method
+        # @param [Array<Fetch::UnitOfWork>] units
+        # @return [void]
+        def bulk_requeue(units, _options)
+          return if units.empty?
+
+          Sidekiq.logger.debug { "Re-queueing terminated jobs" }
+          Sidekiq.redis { |conn| conn.pipelined { units.each(&:requeue) } }
+          Sidekiq.logger.info("Pushed #{units.size} jobs back to Redis")
+        rescue => e
+          Sidekiq.logger.warn("Failed to requeue #{units.size} jobs: #{e}")
+        end
+      end
+
+      # https://github.com/mperham/sidekiq/commit/fce05c9d4b4c0411c982078a4cf3a63f20f739bc
+      if Gem::Version.new(Sidekiq::VERSION) < Gem::Version.new("6.1.0")
+        extend BulkRequeue
+      else
+        include BulkRequeue
+      end
       # Timeout to sleep between fetch retries in case of no job received,
       # as well as timeout to wait for redis to give us something to work.
       TIMEOUT = 2
@@ -50,23 +73,6 @@ module Sidekiq
         nil
       end
 
-      class << self
-        # Requeues all given units as a single operation.
-        #
-        # @see http://www.rubydoc.info/github/redis/redis-rb/master/Redis#pipelined-instance_method
-        # @param [Array<Fetch::UnitOfWork>] units
-        # @return [void]
-        def bulk_requeue(units, _options)
-          return if units.empty?
-
-          Sidekiq.logger.debug { "Re-queueing terminated jobs" }
-          Sidekiq.redis { |conn| conn.pipelined { units.each(&:requeue) } }
-          Sidekiq.logger.info("Pushed #{units.size} jobs back to Redis")
-        rescue => e
-          Sidekiq.logger.warn("Failed to requeue #{units.size} jobs: #{e}")
-        end
-      end
-
       private
 
       # Tries to pop pair of `queue` and job `message` out of sidekiq queues.

data/lib/sidekiq/throttled/version.rb

@@ -3,6 +3,6 @@
 module Sidekiq
   module Throttled
     # Gem version
-    VERSION = "0.12.0"
+    VERSION = "0.13.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-throttled
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Alexey V Zapparov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-22 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -92,6 +92,7 @@ files:
 - gemfiles/sidekiq_5.1.gemfile
 - gemfiles/sidekiq_5.2.gemfile
 - gemfiles/sidekiq_6.0.gemfile
+- gemfiles/sidekiq_6.1.gemfile
 - lib/sidekiq/throttled.rb
 - lib/sidekiq/throttled/communicator.rb
 - lib/sidekiq/throttled/communicator/callbacks.rb
@@ -142,8 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Concurrency and threshold throttling for Sidekiq.