sidekiq-clutch 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a79d553989453b6f6bdb859e2c6a0484ed1d3fdc6992dfa0aa80b79810fa4c2
-  data.tar.gz: 06d6490367f6ed9ad7d1e616128f6a6498242637786e66d8724bea4735718f89
+  metadata.gz: 20afe5d56df439c45d8866da01d4a61f4e9b29ffa795544cae880c158650d15f
+  data.tar.gz: 51226b9dfd3846b652dfd0b17b45a057d16a4ee55b21ad1eeae1701c22279cb8
 SHA512:
-  metadata.gz: 7a80caa3060acfcdb7f5cb3c4497261030c4f07cc1d528bbe078e6c3bb434117ad031d342f3940eaab59de9afb3b39d117a516933d92d3dd17475bea3c56d10d
-  data.tar.gz: ad2c11c85514d5cace032bace89031d2994be6cad8533bffaf1d498d869bdea9eb1dbb4f157e93c393b9ec3b72e3bbfebdb06d3fdc099ea02d41a032d98ecb5d
+  metadata.gz: 33e799264f3bf4c2a7cf6b564e92076b34a491269d5572a3a5623d0b52d766d9a0dd67fdb5f383ee1b4b3480a724bb45fe04c3b645008718cd6c2a990ab7f63c
+  data.tar.gz: 074af1df0fd3b46e8ee4e6b73d79093f096298a7feb21af74ab03e6aa56ae0b04ce3c50d098af49b910e9041af96989dc4592b66575f72fe0466f03c30d68d45

data/.circleci/config.yml

@@ -3,10 +3,11 @@ jobs:
   build:
     parallelism: 1
     docker:
-    - image: circleci/ruby:2.5
+    - image: cimg/ruby:3.3
     - image: redis:3.2
     steps:
     - checkout
+    - run: sed -i "s/spec.add_dependency 'sidekiq', '>= 5.0.0'/spec.add_dependency 'sidekiq', '>= 5.0.0', '< 7.0.0'/" sidekiq-clutch.gemspec
     - run: gem install bundler
     - run: bundle install
     - run: bundle exec rspec

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2.1.2 - Feb 18, 2025
+
+* FIX: Don't leave orphaned redis keys laying around
+* CHANGE: Prefix redis keys for easier identification
+
 # 2.1.1 - Sep 14, 2021
 
 * FIX: Call correct clean up method when legacy jobs are finished

data/lib/sidekiq/clutch/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   class Clutch
-    VERSION = '2.1.1'.freeze
+    VERSION = '2.1.2'.freeze
   end
 end

data/lib/sidekiq/clutch.rb

@@ -14,8 +14,8 @@ module Sidekiq
     end
 
     attr_reader :batch, :queue, :parallel_key
-
     attr_accessor :current_result_key, :on_failure
+    attr_writer :key_base
 
     def parallel
       @parallel_key = SecureRandom.uuid
@@ -87,8 +87,9 @@ module Sidekiq
       end
       parent_batch = Sidekiq::Batch.new(status.parent_bid)
       service = self.class.new(parent_batch)
+      service.key_base = @key_base
       service.jobs.raw = remaining_jobs
-      service.current_result_key = "#{key_base}-#{options['result_key_index']}"
+      service.current_result_key = "#{key_base}:result-#{options['result_key_index']}"
       service.engage
     end
 
@@ -115,11 +116,11 @@ module Sidekiq
     end
 
     def key_base
-      @key_base ||= SecureRandom.uuid
+      @key_base ||= "clutch:#{SecureRandom.uuid}"
     end
 
     def jobs_key
-      "#{key_base}-jobs"
+      "#{key_base}:jobs"
     end
 
     def set_jobs_data_in_redis(data)
@@ -154,7 +155,7 @@ module Sidekiq
 
     def enqueue_job(klass, params, result_key_index)
       job_options = Object.const_get(klass).sidekiq_options
-      result_key = "#{key_base}-#{result_key_index}"
+      result_key = "#{key_base}:result-#{result_key_index}"
       options = {
         'class'     => JobWrapper,
         'queue'     => queue || job_options['queue'],
@@ -171,7 +172,7 @@ module Sidekiq
         redis.del(jobs_key)
         result_key_index = 1
         loop do
-          result = redis.del("#{key_base}-#{result_key_index}")
+          result = redis.del("#{key_base}:result-#{result_key_index}")
           result_key_index += 1
           break if result == 0
         end

data/sidekiq-clutch.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'sidekiq', '>= 5.0.0'
 
-  spec.add_development_dependency 'bundler', '~> 2.2.4'
   spec.add_development_dependency 'rake', '~> 13.0.1'
   spec.add_development_dependency 'rspec', '~> 3.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-clutch
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Tim Morgan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-14 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: An ergonomic wrapper API for Sidekiq Batches