batch_processor 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8f0faec9d505307050df1903ac8804fe7978a6b02fb6244955a1e421775002a
-  data.tar.gz: 326e449ba11aedb79606c2b47aa232b4205724a6822cdbb709b65f3b8177674f
+  metadata.gz: b84438490d8878c15ac50c47cd794492ba09b242416925901ec9e0bfb0cf9d5c
+  data.tar.gz: 718bb854458479e297dae9b902d76a2e03bba68cbf53054ff2726c894e346564
 SHA512:
-  metadata.gz: 1e0201cbb2edb12428adb676f2b19177a83153de3612372f8d80755bd3278ecf222ab44107835c2d16c6629be6109f2685f5bc4fdc7364fa04ba4d9187979109
-  data.tar.gz: 5c97dae7e460fc3e1e19216befee5b1e09a1d91a540150ce232722898fda74b217c72023a7534e5e54e2d51031a3a9bc1c8ada21d88f498de499ff6f9a0b927b
+  metadata.gz: 5822bc83e28b613c5e211606d75f015fedb66a5d0cce955f815a866a73cc4f460d7ebdb59b98dbf84573979619cf4f995c4cbab4b2ec7c4317f42c16852a61dc
+  data.tar.gz: e7223742d5e6dd841a6ae633c7a91f5a94ee597d6caeafd3df19aec8415897f192ef5da8da16e68fd7de63c57727dadbe86ae462097346e2b691e1ca1bb60ca9

data/lib/batch_processor/batch_job.rb

@@ -3,7 +3,7 @@
 # A batch can only be processed by a batchable job.
 module BatchProcessor
   class BatchJob < ActiveJob::Base
-    attr_accessor :batch_id
+    attr_accessor :batch_id, :tracked_batch_running
 
     include Technologic
 
@@ -20,6 +20,8 @@ module BatchProcessor
     before_perform(if: :batch_job?) do
       raise BatchAbortedError if batch.aborted?
 
+      self.tracked_batch_running = true
+
       batch.job_running
     end
 
@@ -28,10 +30,7 @@ module BatchProcessor
     def rescue_with_handler(exception)
       batch.job_canceled and return exception if exception.is_a?(BatchAbortedError)
 
-      if batch_job?
-        error :batch_job_failed, exception: exception, job_id: job_id
-        batch.job_failure
-      end
+      batch_job_failure(exception) if batch_job?
 
       super
     end
@@ -60,5 +59,13 @@ module BatchProcessor
     def batch_job?
       batch_id.present?
     end
+
+    private
+
+    def batch_job_failure(exception)
+      error :batch_job_failed, exception: exception, job_id: job_id
+      batch.job_running unless tracked_batch_running
+      batch.job_failure
+    end
   end
 end

data/lib/batch_processor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BatchProcessor
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: batch_processor
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Eric Garside