sidekiq-group 0.1.3 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd109b06a1d0e8b3dfc74edf53aaf8fb57e72046c9eac0352abc79c83560fb04
-  data.tar.gz: 309916f9bddab5075cec3690de80b33a305986074157b3f86a0ee0a906dd72c8
+  metadata.gz: fb1e0ba3a53c5a009c265ceabc99fc5153be564c12ed6c30f30e13040fc304f6
+  data.tar.gz: 1d99d5a585a6b37e0fae401cf06a6198bc47b017a1ecae620d7659d642356573
 SHA512:
-  metadata.gz: d64c64fbbb3c950ad847a49ce94dea78084443de6260e513cb4575466084a0b0225cdf048aa1f9c881b9b0539feda2a43fd94c29fc161ab23b8c216c75d0c695
-  data.tar.gz: 2a491e6947ac7b9b27b82c3ce098b013b948a4c913606e228a1c5f8924d921fb1960093e634a68992d07c72c4b3096da7055aa3fac2766b150f786d12029eacc
+  metadata.gz: 949c2e7b90cee062a5bbd4d00ad9236a77c8432fd96fc7f14006067af0c9b8862d05bb4d126d672029250fe96021c8f3769ab8a3e24d9438f7ea4600da917f81
+  data.tar.gz: e6b7a7cc4c5d90b1bca83f510eaa47db8d63dcdf3eb2e30b8e3a7fdd5ec3c04fba907446dc01f9ddeb170d078e95791ff21c40fcfa17e1643a54e6001bfe2165

data/lib/sidekiq/group/collection.rb

@@ -24,10 +24,12 @@ module Sidekiq
       end
 
       def add(jid)
+        Sidekiq::Logging.logger.info "Scheduling child job #{jid} for parent #{@cid}" if Sidekiq::Group.debug
+
         Sidekiq.redis do |r|
-          r.multi do
-            r.sadd("#{@cid}-jids", jid)
-            r.expire("#{@cid}-jids", CID_EXPIRE_TTL)
+          r.multi do |pipeline|
+            pipeline.sadd("#{@cid}-jids", jid)
+            pipeline.expire("#{@cid}-jids", CID_EXPIRE_TTL)
           end
         end
       end
@@ -44,6 +46,8 @@ module Sidekiq
 
         callback_class, callback_options = callback_data
         options = JSON(callback_options)
+
+        Sidekiq::Logging.logger.info "Scheduling callback job #{callback_class} with #{options}" if Sidekiq::Group.debug
         Sidekiq::Group::Worker.perform_async(callback_class, options)
 
         cleanup_redis
@@ -52,14 +56,22 @@ module Sidekiq
       private
 
       def remove_processed(jid)
+        Sidekiq::Logging.logger.info "Child job #{jid} completed" if Sidekiq::Group.debug
+
+        return if Sidekiq.redis { |r| r.srem("#{@cid}-jids", jid) }
+
+        Sidekiq::Logging.logger.info "Could not remove child job #{jid} from Redis" if Sidekiq::Group.debug
+        sleep 1
         Sidekiq.redis { |r| r.srem("#{@cid}-jids", jid) }
       end
 
       def pending
-        Sidekiq.redis { |r| r.scard("#{@cid}-jids") }
+        @pending ||= Sidekiq.redis { |r| r.scard("#{@cid}-jids") }
       end
 
       def processed_all_jobs?
+        Sidekiq::Logging.logger.info "Pending jobs: #{pending}" if Sidekiq::Group.debug
+
         spawned_all_jobs? && pending.zero?
       end
 
@@ -69,18 +81,18 @@ module Sidekiq
 
       def callback_data
         Sidekiq.redis do |r|
-          r.multi do
-            r.hget(@cid, 'callback_class')
-            r.hget(@cid, 'callback_options')
+          r.multi do |pipeline|
+            pipeline.hget(@cid, 'callback_class')
+            pipeline.hget(@cid, 'callback_options')
           end
         end
       end
 
       def persist(attribute, value)
         Sidekiq.redis do |r|
-          r.multi do
-            r.hset(@cid, attribute, value)
-            r.expire(@cid, CID_EXPIRE_TTL)
+          r.multi do |pipeline|
+            pipeline.hset(@cid, attribute, value)
+            pipeline.expire(@cid, CID_EXPIRE_TTL)
           end
         end
       end
@@ -91,9 +103,9 @@ module Sidekiq
 
       def locked?
         Sidekiq.redis do |r|
-          r.multi do
-            r.getset("#{@cid}-finished", 1)
-            r.expire("#{@cid}-finished", LOCK_TTL)
+          r.multi do |pipeline|
+            pipeline.getset("#{@cid}-finished", 1)
+            pipeline.expire("#{@cid}-finished", LOCK_TTL)
           end.first
         end
       end

data/lib/sidekiq/group/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Group
-    VERSION = '0.1.3'.freeze
+    VERSION = '0.1.7'.freeze
   end
 end

data/lib/sidekiq/group.rb

@@ -1,4 +1,3 @@
-require 'sidekiq/logging'
 require 'sidekiq/group/version'
 require 'sidekiq/group/collection'
 require 'sidekiq/group/middleware'
@@ -7,6 +6,10 @@ module Sidekiq
   module Group
     class NoBlockGivenError < StandardError; end
 
+    class << self
+      attr_accessor :debug
+    end
+
     def sidekiq_group(options = {})
       raise NoBlockGivenError unless block_given?
 
@@ -28,7 +31,7 @@ module Sidekiq
     end
 
     def sidekiq_logger
-      Sidekiq::Logging.logger
+      Sidekiq.logger
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-group
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.7
 platform: ruby
 authors:
 - Matic developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-23 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -33,7 +33,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,21 +43,21 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Addon for Sidekiq that provides similar functionality to Pro version Batches