sidekiq-group 0.1.6 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a8adb022ba523756cfb421bd98796ec2b99173fe1359b3bf00952ab27a3442f
-  data.tar.gz: 5a8a8c5393db492eebf711d3d24004d188ef310d27e72dc8cc6f2408017f567f
+  metadata.gz: a7197dfaf3c0ad54a8b27fce70680a491c4c4934639b18c881e3940ad93c5625
+  data.tar.gz: 86669502c2f3b4589a1a9d5fafec9769cd72953286acec9851da3e8978b5e1c9
 SHA512:
-  metadata.gz: 6dee7e487580f3c0acb8f59015bc6ec8f19455aba125d8801575703deaa220094781b8660646c404fa3cf31a66b3eccd4d2f21d69c6a611f53fac368b7a76b78
-  data.tar.gz: ef1ab42cbec4753ba03613916018baa771b4bbbbc6d38559a4106fe742aa4102b4acbc31e345a90e830371e9c794bdf749bd93c42179d9d3e1a9e12ddbab5eae
+  metadata.gz: 9fe0ebc017096adbcc291fbf3072158ba078242b930ea154dc99c55eae6eb9dfd18cd26432b54eae62d97fbd572553348776bbf049a1741178f29152665a2195
+  data.tar.gz: '09ee9db6fa85a00a1fe1224d9d904049d36bbf936b7757352f9ca3d72e1c7dbd4c44e7a817de2b70be2c60a568e63e4cd4c998adfd753e244f9609af94ccf708'

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,20 @@ module Sidekiq
         persist('callback_options', value.to_json)
       end
 
-      def add(jid)
-        Sidekiq::Logging.logger.info "Scheduling child job #{jid} for parent #{@cid}" if Sidekiq::Group.debug
+      def initialize_total_value
+        persist('total', 0)
+      end
+
+      def add(jids)
+        jids = Array(jids)
+
+        Sidekiq.logger.info "Scheduling child job #{jids} 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", jids)
+            pipeline.expire("#{@cid}-jids", CID_EXPIRE_TTL)
+            pipeline.hincrby(@cid, 'total', jids.size)
           end
         end
       end
@@ -47,20 +55,32 @@ 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::Logging.logger.info "Could not remove child job #{jid} from Redis" if Sidekiq::Group.debug
+        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
@@ -70,7 +90,7 @@ module Sidekiq
       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
@@ -81,18 +101,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
@@ -103,9 +123,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.6'.freeze
+    VERSION = '0.1.9'.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.6
+  version: 0.1.9
 platform: ruby
 authors:
 - Matic developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-07 00:00:00.000000000 Z
+date: 2022-08-16 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