good_job 3.26.0 → 3.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a51ff44544ae7fb381fce50f13d3196d6a561bcdc6a5af7f37ad1e8fb0d6b258
-  data.tar.gz: 3703fe631d3f549bb152999203e5d67ac6d305c4ac77bba5b47621f3419cef21
+  metadata.gz: eedb4c5defcfa2e25d62147f5021bb868ee0a93b74ae680c46ea4e852212d0dc
+  data.tar.gz: d0124daaa3d93e7ace5b0764031c44cc06b03559286ebf1e5a36936e414bb50d
 SHA512:
-  metadata.gz: ba6647af970ee04455977ccdfb835ac03648bc544ae3606e69e2007d04bf13634f0767c1263738d04101a6839949affd3227a19b1b573d27a6cb8bb4ea56a5b6
-  data.tar.gz: 3c8e79ae13f69d050f35aea95ebaf4c035a97138a89d24c57430776909d44c9fbbd9a5ab4460ca30efd65c2c16ec231780957c555f43a77dc100388dbfffb341
+  metadata.gz: 15c9fbd5228a60caa7a1d13ec9e6165c1a78ea488a9e7dd992cf60339dfb9523ca8cc68efa0588dddf16f491bf065a878837d943355a7bcae8ba80ec998615d4
+  data.tar.gz: aea808fb1eb1ce99c9de4b15c429dc8128d7eee29445a1ca5172498d9f919f8596f28416e2967c41d4bcb6e389e098db90f865e9dce1870229131aaa28212930

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [v3.26.1](https://github.com/bensheldon/good_job/tree/v3.26.1) (2024-03-01)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.26.0...v3.26.1)
+
+**Fixed bugs:**
+
+- Ignore job deserialization errors when mass-retrying through the dashboard [\#1269](https://github.com/bensheldon/good_job/pull/1269) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- Plain HTTP 500 Error when retrying a job for deleted record [\#1263](https://github.com/bensheldon/good_job/issues/1263)
+
 ## [v3.26.0](https://github.com/bensheldon/good_job/tree/v3.26.0) (2024-03-01)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v3.25.0...v3.26.0)

data/app/controllers/good_job/jobs_controller.rb

@@ -44,10 +44,13 @@ module GoodJob
         end
 
         job
-      rescue GoodJob::Job::ActionForStateMismatchError, GoodJob::AdvisoryLockable::RecordAlreadyAdvisoryLockedError
+      rescue GoodJob::Job::ActiveJobDeserializationError,
+             GoodJob::Job::ActionForStateMismatchError,
+             GoodJob::AdvisoryLockable::RecordAlreadyAdvisoryLockedError
         nil
       end.compact
 
+      # TODO: Put these messages through I18n
       notice = if processed_jobs.any?
                  "Successfully #{ACTIONS[mass_action]} #{processed_jobs.count} #{'job'.pluralize(processed_jobs.count)}"
                else
@@ -94,11 +97,14 @@ module GoodJob
     private
 
     def redirect_on_error(exception)
+      # TODO: Put these messages through I18n
       alert = case exception
               when GoodJob::Job::AdapterNotGoodJobError
                 "Active Job Queue Adapter must be GoodJob."
               when GoodJob::Job::ActionForStateMismatchError
                 "Job is not in an appropriate state for this action."
+              when GoodJob::Job::ActiveJobDeserializationError
+                "Active Job data could not be deserialized."
               else
                 exception.to_s
               end

data/app/models/good_job/base_execution.rb

@@ -104,8 +104,10 @@ module GoodJob
     def active_job(ignore_deserialization_errors: false)
       ActiveJob::Base.deserialize(active_job_data).tap do |aj|
         aj.send(:deserialize_arguments_if_needed)
+      rescue ActiveJob::DeserializationError
+        raise unless ignore_deserialization_errors
       end
-    rescue ActiveJob::DeserializationError, NameError
+    rescue NameError
       raise unless ignore_deserialization_errors
     end
 

data/app/models/good_job/job.rb

@@ -13,6 +13,8 @@ module GoodJob
     AdapterNotGoodJobError = Class.new(StandardError)
     # Attached to a Job's Execution when the Job is discarded.
     DiscardJobError = Class.new(StandardError)
+    # Raised when Active Job data cannot be deserialized
+    ActiveJobDeserializationError = Class.new(StandardError)
 
     class << self
       delegate :table_name, to: GoodJob::Execution
@@ -186,8 +188,9 @@ module GoodJob
     def retry_job
       with_advisory_lock do
         execution = head_execution(reload: true)
-        active_job = execution.active_job
+        active_job = execution.active_job(ignore_deserialization_errors: true)
 
+        raise ActiveJobDeserializationError if active_job.nil?
         raise AdapterNotGoodJobError unless active_job.class.queue_adapter.is_a? GoodJob::Adapter
         raise ActionForStateMismatchError if execution.finished_at.blank? || execution.error.blank?
 

data/lib/good_job/version.rb

@@ -2,7 +2,7 @@
 
 module GoodJob
   # GoodJob gem version.
-  VERSION = '3.26.0'
+  VERSION = '3.26.1'
 
   # GoodJob version as Gem::Version object
   GEM_VERSION = Gem::Version.new(VERSION)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 3.26.0
+  version: 3.26.1
 platform: ruby
 authors:
 - Ben Sheldon