chained_job 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4699f818627cf6babf70086a5c5d4ac5016b17bedfb48670fd262f28b2da9350
-  data.tar.gz: 3d2f5a59e1fedaa8b11894f819739d254aa75620da658dafbb4435d1796412f1
+  metadata.gz: 302406755991a635c9a0e06329f3debf5ca88f3c3cf109c232b4c1c69adee53a
+  data.tar.gz: a61d69fc02d654c279fcede0e27ad7c6f4a29053f48604dd1edade9750b24928
 SHA512:
-  metadata.gz: c4d6af80816570f45cc5b3e02aadb8d53f63fa10c009278401318a0a608d93d9e789038c594dedd4acd7cc54d6fd9459b13169f70d29d1687b1c82af2546e05e
-  data.tar.gz: c4f945a8a699eeda1fa4524ba526442efa91dc83c7a5aab1485bcdda5f79c65e94d085bb706791b65262012770dd8ea85f97b6979631576ee30c8dabea8c2257
+  metadata.gz: 8bc2a320ddf508645c665a0636ad5b56b64be0a1d2e87549337bce7e2838115de98834fbcbae95a1efdae7e214fa2339908e149e19d9ebc82fddf5f5ef8f1d6b
+  data.tar.gz: b5d27297433d205f6e2ebc965c3170bef46f1bdef800287810597df564471977cf6e1c2dc73bdf587dbd53155a226c6342160a79119d55a68f6329e5451d7a11

data/lib/chained_job/helpers.rb

@@ -15,5 +15,9 @@ module ChainedJob
     def tag_list(prefix)
       "#{prefix}:tags"
     end
+
+    def serialize(arguments)
+      arguments.map { |argument| Marshal.dump(argument) }
+    end
   end
 end

data/lib/chained_job/middleware.rb

@@ -17,12 +17,12 @@ module ChainedJob
       if worker_id
         ChainedJob::Process.run(args, self, job_arguments_key, worker_id, tag)
       else
-        ChainedJob::StartChains.run(args, self.class, job_arguments_key, arguments_array, parallelism)
+        ChainedJob::StartChains.run(args, self.class, job_arguments_key, arguments_array(args), parallelism)
       end
     end
 
-    def arguments_array
-      options = { job_class: self.class }
+    def arguments_array(args)
+      options = { job_class: self.class, args: args }
       ChainedJob.config.around_array_of_job_arguments.call(options) { array_of_job_arguments }
     end
 

data/lib/chained_job/process.rb

@@ -22,19 +22,28 @@ module ChainedJob
       with_hooks do
         return finished_worker unless argument
 
-        job_instance.process(argument)
+        begin
+          job_instance.process(argument)
+        rescue StandardError => e
+          push_job_arguments_back if handle_retry?
+          raise e
+        end
         job_instance.class.perform_later(args, worker_id, job_tag)
       end
     end
 
     private
 
+    def handle_retry?
+      job_instance.try(:handle_retry?)
+    end
+
     def with_hooks
       ChainedJob.config.around_chain_process.call(options) { yield }
     end
 
     def options
-      @options ||= { job_class: job_instance.class, worker_id: worker_id }
+      @options ||= { job_class: job_instance.class, worker_id: worker_id, args: args }
     end
 
     def finished_worker
@@ -72,5 +81,9 @@ module ChainedJob
     def job_key
       Helpers.job_key(job_arguments_key)
     end
+
+    def push_job_arguments_back
+      ChainedJob.redis.rpush(redis_key, Helpers.serialize([argument]))
+    end
   end
 end

data/lib/chained_job/start_chains.rb

@@ -49,6 +49,7 @@ module ChainedJob
         job_class: job_class,
         array_of_job_arguments: array_of_job_arguments,
         parallelism: parallelism,
+        args: args,
       }
     end
 

data/lib/chained_job/store_job_arguments.rb

@@ -20,7 +20,7 @@ module ChainedJob
       set_tag_list
 
       array_of_job_arguments.each_slice(config.arguments_batch_size) do |sublist|
-        ChainedJob.redis.rpush(redis_key, serialize(sublist))
+        ChainedJob.redis.rpush(redis_key, Helpers.serialize(sublist))
       end
 
       ChainedJob.redis.expire(redis_key, config.arguments_queue_expiration)
@@ -44,10 +44,6 @@ module ChainedJob
       @job_key ||= Helpers.job_key(job_arguments_key)
     end
 
-    def serialize(arguments)
-      arguments.map { |argument| Marshal.dump(argument) }
-    end
-
     def config
       ChainedJob.config
     end

data/lib/chained_job/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ChainedJob
-  VERSION = '0.6.0'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chained_job
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Mantas Kūjalis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-31 00:00:00.000000000 Z
+date: 2022-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler