sidekiq-group 0.1.5 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daac2c22dce158c21d76eb8df0a73ee7c2bf609e6a12770ea7729773fa2cf31a
-  data.tar.gz: 971c4123baa5a96e96547eee6b8aea244df408d4444522c6b75c2d4b446001eb
+  metadata.gz: c01687c2cafb914630079a57d1924310a4627b01f3175e4eb8f926531d0d710c
+  data.tar.gz: ce7e0d3ff94646c2758f4b44e8a8e009bc72711b85cb1e1f06380b63a6b8b39a
 SHA512:
-  metadata.gz: c6f340825e2a5907839c55b275c4e541b0c31de73ea99fded7c3cfa1c68d18f9a122059d6034d3605d1d9ff569aba09bb4d120c9d29209a8fbd04790449d998f
-  data.tar.gz: ebcac21bf4185d60f11b79bfbb5016aabb77b5d709c7dbe64bc573228bba644ceb2fbc5b18ca06f1240c4ac965c8ef693ae95ae91f2846803499f5e6a23727e3
+  metadata.gz: 28a17e1b54c0386a8a7edd0c4633cfdb92076d1bcd979cf7ec9fbd027257fb88d32950eadbacba0932d4b000748fb151cc1362040b1606ef7df8572271e90735
+  data.tar.gz: 30d4868239cbbab6878f7af54a045bc02d03922bf0f0490430360f0ad4eab741125753717a81c0346697541e077ee14b89e9f0218ee1fe308b1a49fe608ccd59

data/lib/sidekiq/group/collection.rb

@@ -8,6 +8,7 @@ module Sidekiq
       LOCK_TTL = 3600
 
       attr_reader :cid, :callback_class, :callback_options
+      alias group_id cid
 
       def initialize(cid = nil)
         @cid = cid || SecureRandom.urlsafe_base64(16)
@@ -23,13 +24,18 @@ module Sidekiq
         persist('callback_options', value.to_json)
       end
 
+      def initialize_total_value
+        persist('total', 0)
+      end
+
       def add(jid)
-        Sidekiq::Logging.logger.info "Scheduling child job #{jid}" if Sidekiq::Group.debug
+        Sidekiq.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)
+            pipeline.hincrby(@cid, 'total', 1)
           end
         end
       end
@@ -47,26 +53,42 @@ 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.logger.info "Scheduling callback job #{callback_class} with #{options}" if Sidekiq::Group.debug
         Sidekiq::Group::Worker.perform_async(callback_class, options)
 
         cleanup_redis
       end
 
+      def total
+        return unless spawned_all_jobs?
+
+        Sidekiq.redis { |r| r.hget(@cid, 'total').to_i }
+      end
+
+      def processed
+        return unless spawned_all_jobs?
+
+        total - pending
+      end
+
       private
 
       def remove_processed(jid)
-        Sidekiq::Logging.logger.info "Child job #{jid} completed" if Sidekiq::Group.debug
+        Sidekiq.logger.info "Child job #{jid} completed" if Sidekiq::Group.debug
+
+        return if Sidekiq.redis { |r| r.srem("#{@cid}-jids", jid) }
 
+        Sidekiq.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
+        Sidekiq.logger.info "Pending jobs: #{pending}" if Sidekiq::Group.debug
 
         spawned_all_jobs? && pending.zero?
       end
@@ -77,18 +99,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
@@ -99,9 +121,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.5'.freeze
+    VERSION = '0.1.8'.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'
@@ -9,6 +8,12 @@ module Sidekiq
 
     class << self
       attr_accessor :debug
+
+      def progress(group_id)
+        group = Sidekiq::Group::Collection.new(group_id)
+
+        { total: group.total, processed: group.processed }
+      end
     end
 
     def sidekiq_group(options = {})
@@ -17,6 +22,7 @@ module Sidekiq
       group = Sidekiq::Group::Collection.new
       group.callback_class = self.class.name
       group.callback_options = options
+      group.initialize_total_value
 
       Thread.current[:group_collection] = group
 
@@ -32,7 +38,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.5
+  version: 0.1.8
 platform: ruby
 authors:
 - Matic developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-31 00:00:00.000000000 Z
+date: 2022-08-15 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,7 +43,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   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