good_job 3.15.10 → 3.15.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 000bb49d312d0103d77ce95d27e79316b7ee66b1056e0566cc1029272442c77a
-  data.tar.gz: f990fccc402be6ac4dca1e2c8c8f3f57c2a73b00d5c1a065afa1d9ca6645f602
+  metadata.gz: 983b4d8a2381c6564ab48334b2587ae33dee8cf1385d72456f29caf8dd99e26d
+  data.tar.gz: fd4a54679b61b925f3c0fe6eb07d490f6b92014e2b7a12ac869f77c4c32482e2
 SHA512:
-  metadata.gz: db26d83de8e6f07447d1ae866ea065a4b8beb37bd9c93d726929b8d0972ba0f862efd641128bffe35e964fcf2589459d60f57751f4b20d7ab16fc1daeb35a82e
-  data.tar.gz: aae23731a957a0418f13eadc9e2deab3f5378286cb3e40c00f2cf0341dd99d1a0a73f49873835f14c7e2032a4a1738310038752da8e270ac0864591c662811ad
+  metadata.gz: 3d2d8be450c7f282e6b59c6a4730ab0eebb77c2f8c45eadf0fe556b6490b6b6e38cb247e205da275930f6bd2c4a5d23e844088004a13454e2286af72a001c095
+  data.tar.gz: 61764d8612c50fa00ea2c5aadf2d2d5ea365f771cb43aedc87bc7456d0d2a1381a3985a518ffeecd382bec27b838ce423268175e0b68687a6722ef77d2b38f88

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [v3.15.11](https://github.com/bensheldon/good_job/tree/v3.15.11) (2023-06-06)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.15.10...v3.15.11)
+
+**Fixed bugs:**
+
+- Fix `discrete_executions` job re-enqueueing when `retry_job` is called directly [\#973](https://github.com/bensheldon/good_job/pull/973) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- Unclear how discrete executions should work with reenqueued  jobs \(leads to broken job-iteration\) [\#972](https://github.com/bensheldon/good_job/issues/972)
+- `build_for_enqueue` discards `scheduled_at` values for bulk-enqueued jobs [\#966](https://github.com/bensheldon/good_job/issues/966)
+
 ## [v3.15.10](https://github.com/bensheldon/good_job/tree/v3.15.10) (2023-05-22)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v3.15.9...v3.15.10)

data/app/models/good_job/execution.rb

@@ -314,6 +314,8 @@ module GoodJob
             execution = current_execution
             execution.assign_attributes(enqueue_args(active_job, { scheduled_at: scheduled_at }))
             execution.scheduled_at ||= Time.current
+            # TODO: these values ideally shouldn't be persisted until the current_execution is finished
+            #   which will require handling `retry_job` being called from outside the execution context.
             execution.performed_at = nil
             execution.finished_at = nil
           else
@@ -335,7 +337,11 @@ module GoodJob
         instrument_payload[:execution] = execution
         execution.save!
 
-        CurrentThread.execution.retried_good_job_id = execution.id if retried && !CurrentThread.execution.discrete?
+        if retried
+          CurrentThread.execution_retried = true
+          CurrentThread.execution.retried_good_job_id = execution.id unless current_execution.discrete?
+        end
+
         active_job.provider_job_id = execution.id
         execution
       end
@@ -402,9 +408,9 @@ module GoodJob
             instrument_payload.merge!(
               value: value,
               handled_error: handled_error,
-              retried: current_thread.error_on_retry.present?
+              retried: current_thread.execution_retried
             )
-            ExecutionResult.new(value: value, handled_error: handled_error, retried: current_thread.error_on_retry.present?)
+            ExecutionResult.new(value: value, handled_error: handled_error, retried: current_thread.execution_retried)
           rescue StandardError => e
             instrument_payload[:unhandled_error] = e
             ExecutionResult.new(value: nil, unhandled_error: e)

data/lib/good_job/current_thread.rb

@@ -13,6 +13,7 @@ module GoodJob
       error_on_retry
       execution
       execution_interrupted
+      execution_retried
     ].freeze
 
     # @!attribute [rw] cron_at
@@ -51,6 +52,12 @@ module GoodJob
     #   @return [Boolean, nil]
     thread_mattr_accessor :execution_interrupted
 
+    # @!attribute [rw] execution_retried
+    #   @!scope class
+    #   Execution Retried
+    #   @return [Boolean, nil]
+    thread_mattr_accessor :execution_retried
+
     # Resets attributes
     # @param [Hash] values to assign
     # @return [void]

data/lib/good_job/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module GoodJob
   # GoodJob gem version.
-  VERSION = '3.15.10'
+  VERSION = '3.15.11'
 
   # GoodJob version as Gem::Version object
   GEM_VERSION = Gem::Version.new(VERSION)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 3.15.10
+  version: 3.15.11
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-22 00:00:00.000000000 Z
+date: 2023-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob