sidekiq-limit_fetch 4.2.0 → 4.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d18f2af7e57af75a611a37e2e0034bf872b08e88fbbd26c43ef116a52a1a0b3
-  data.tar.gz: b1bd773b0cf440236fa0fe9a1533d2a50269d6c4173d39b4acf84b2959e6821f
+  metadata.gz: ca583389b5cea0b31200752d2c0dd85a03d38a7ea576c9a299a99367a1c8086d
+  data.tar.gz: 335f49aac1d3ee9128a3c92eb88a25010d906a8b8d8701d1a79b1e41349ca256
 SHA512:
-  metadata.gz: cdac031f971700a4b8ec4ef05e3808569bb4342df709222eab4cfbb38a2390c1458d4d10da51b89e46dd2571f64f0ec9e5ac0c4479109099f4e97131ce2ea8d2
-  data.tar.gz: 4c2d3df1c1c88ac9ade864968d5692b3196d53d1a69d17458d6bdde92edb9a2b089a7ffd7777eacb3f6e27e418e6cd5aebc82dbf9faa2a3eb8ebb3ca0d7b71b0
+  metadata.gz: 00daee076b583097d361fed04a7128188af6d8a287906a644d0449c01dd8748fd4b8b9d233eddfe1f1da22d0492626088f11e4eb9785dd31da75a47c57437726
+  data.tar.gz: 110b867205d0aea423ec63d8e010d5d1b75398b5aefce782fdb2320fd5e6114b10d041f59306fadb650d3401ea6a8c2fd962a6fd80d793162d8d14061c510e66

data/CHANGELOG.md

@@ -1,13 +1,23 @@
 # Changelog
 
-All notable changes to this project will be documented in this file.
+## [4.3.2] - 2022-09-01
 
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+- #139 - Fix Redis deprecation warnings from [@adamzapasnik](https://github.com/adamzapasnik)
 
-## [4.1.0] - 2022-03-29
+## [4.3.1] - 2022-08-23
+
+- #137 - Fix deprecation of passing timeout as positional argument to brpop from [@cgunther](https://github.com/cgunther)
+
+## [4.3.0] - 2022-08-16
+
+- #135 - Some extra fixes for Sidekiq 6.5 (fixes #128, #130, #131) from [@BobbyMcWho](https://github.com/BobbyMcWho)
 
-### Changed
+## [4.2.0] - 2022-06-09
+
+- #127 - Fix for Sidekiq 6.5 internal change vias PR #128 from [@evgeniradev][https://github.com/evgeniradev]
+- testing changes: stop supporting Sidekiq < 6, add tests for Sidekiq 6.5, stop testing on ruby 2.6 EOL
+
+## [4.1.0] - 2022-03-29
 
 - #101 - Fix stuck queues bug on Redis restart from [@907th](https://github.com/907th).
 
@@ -15,8 +25,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 This project was taken over by [@deanpcmad](https://github.com/deanpcmad)
 
-### Changed
-
 - #120 - Migrate CI to GitHub Actions from [@petergoldstein](https://github.com/petergoldstein).
 - #124 - Fixed redis v4.6.0 pipelines deprecation warning from [@iurev](https://github.com/iurev).
-- #83  - Processing dynamic queues from [@alexey-yanchenko](https://github.com/alexey-yanchenko).
+- #83  - Processing dynamic queues from [@alexey-yanchenko](https://github.com/alexey-yanchenko).

data/gemfiles/sidekiq_6.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    sidekiq-limit_fetch (4.1.0)
+    sidekiq-limit_fetch (4.3.2)
       redis (>= 4.6.0)
       sidekiq (>= 4)
 
@@ -53,4 +53,4 @@ DEPENDENCIES
   sidekiq-limit_fetch!
 
 BUNDLED WITH
-   2.3.14
+   2.3.21

data/gemfiles/sidekiq_6.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    sidekiq-limit_fetch (4.1.0)
+    sidekiq-limit_fetch (4.3.2)
       redis (>= 4.6.0)
       sidekiq (>= 4)
 
@@ -50,4 +50,4 @@ DEPENDENCIES
   sidekiq-limit_fetch!
 
 BUNDLED WITH
-   2.3.14
+   2.3.21

data/gemfiles/sidekiq_6.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    sidekiq-limit_fetch (4.1.0)
+    sidekiq-limit_fetch (4.3.2)
       redis (>= 4.6.0)
       sidekiq (>= 4)
 
@@ -50,4 +50,4 @@ DEPENDENCIES
   sidekiq-limit_fetch!
 
 BUNDLED WITH
-   2.3.14
+   2.3.21

data/gemfiles/sidekiq_6.3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    sidekiq-limit_fetch (4.1.0)
+    sidekiq-limit_fetch (4.3.2)
       redis (>= 4.6.0)
       sidekiq (>= 4)
 
@@ -50,4 +50,4 @@ DEPENDENCIES
   sidekiq-limit_fetch!
 
 BUNDLED WITH
-   2.3.14
+   2.3.21

data/gemfiles/sidekiq_6.4.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    sidekiq-limit_fetch (4.1.0)
+    sidekiq-limit_fetch (4.3.2)
       redis (>= 4.6.0)
       sidekiq (>= 4)
 
@@ -50,4 +50,4 @@ DEPENDENCIES
   sidekiq-limit_fetch!
 
 BUNDLED WITH
-   2.3.14
+   2.3.21

data/gemfiles/sidekiq_6.5.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    sidekiq-limit_fetch (4.1.0)
+    sidekiq-limit_fetch (4.3.2)
       redis (>= 4.6.0)
       sidekiq (>= 4)
 
@@ -50,4 +50,4 @@ DEPENDENCIES
   sidekiq-limit_fetch!
 
 BUNDLED WITH
-   2.3.5
+   2.3.21

data/gemfiles/sidekiq_master.gemfile.lock

@@ -10,7 +10,7 @@ GIT
 PATH
   remote: ..
   specs:
-    sidekiq-limit_fetch (4.1.0)
+    sidekiq-limit_fetch (4.3.2)
       redis (>= 4.6.0)
       sidekiq (>= 4)
 
@@ -55,4 +55,4 @@ DEPENDENCIES
   sidekiq-limit_fetch!
 
 BUNDLED WITH
-   2.3.14
+   2.3.21

data/lib/sidekiq/limit_fetch/global/monitor.rb

@@ -33,7 +33,7 @@ module Sidekiq::LimitFetch::Global
 
     def remove_old_processes!
       Sidekiq.redis do |it|
-        old_processes.each {|process| it.srem PROCESS_SET, process }
+        old_processes.each {|process| it.srem PROCESS_SET, [process] }
       end
     end
 
@@ -48,7 +48,7 @@ module Sidekiq::LimitFetch::Global
       Sidekiq.redis do |it|
         it.multi do |pipeline|
           pipeline.set heartbeat_key, true
-          pipeline.sadd PROCESS_SET, Selector.uuid
+          pipeline.sadd PROCESS_SET, [Selector.uuid]
           pipeline.expire heartbeat_key, ttl
         end
       end

data/lib/sidekiq/limit_fetch/unit_of_work.rb

@@ -1,7 +1,11 @@
 module Sidekiq
   class LimitFetch::UnitOfWork < BasicFetch::UnitOfWork
     def initialize(queue, job)
-      super
+      if post_6_5?
+        super(queue, job, Sidekiq)
+      else
+        super
+      end
       redis_retryable { Queue[queue_name].increase_busy }
     end
 
@@ -17,6 +21,10 @@ module Sidekiq
 
     private
 
+    def post_6_5?
+      Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('6.5.0')
+    end
+
     def redis_retryable(&block)
       Sidekiq::LimitFetch.redis_retryable(&block)
     end

data/lib/sidekiq/limit_fetch.rb

@@ -28,13 +28,18 @@ module Sidekiq::LimitFetch
     UnitOfWork.new(queue, job) if job
   end
 
+  def config
+    # Post 6.5, Sidekiq.options is deprecated and replaced with passing Sidekiq directly
+    post_6_5? ? Sidekiq : Sidekiq.options
+  end
+
   # Backwards compatibility for sidekiq v6.1.0
   # @see https://github.com/mperham/sidekiq/pull/4602
   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(Sidekiq.options).bulk_requeue(*args)
+      Sidekiq::BasicFetch.new(config).bulk_requeue(*args)
     end
   end
 
@@ -56,12 +61,16 @@ module Sidekiq::LimitFetch
 
   private
 
+  def post_6_5?
+    @post_6_5 ||= Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('6.5.0')
+  end
+
   def redis_brpop(queues)
     if queues.empty?
       sleep TIMEOUT  # there are no queues to handle, so lets sleep
       []             # and return nothing
     else
-      redis_retryable { Sidekiq.redis { |it| it.brpop *queues, TIMEOUT } }
+      redis_retryable { Sidekiq.redis { |it| it.brpop *queues, timeout: TIMEOUT } }
     end
   end
 end

data/sidekiq-limit_fetch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = 'sidekiq-limit_fetch'
-  gem.version       = '4.2.0'
+  gem.version       = '4.3.2'
   gem.license       = 'MIT'
   gem.authors       = ['Dean Perry', 'brainopia']
   gem.email         = 'dean@deanpcmad.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-limit_fetch
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.3.2
 platform: ruby
 authors:
 - Dean Perry
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-09 00:00:00.000000000 Z
+date: 2022-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq