Style cleanup to Job error handling

bensheldon · Sep 21, 2020 · 2f2c492 · 2f2c492
1 parent 0b3e0e6
commit 2f2c492
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/good_job/job.rb b/lib/good_job/job.rb
@@ -192,7 +192,10 @@ def perform
       result, unhandled_error = execute
 
       result_error = nil
-      result, result_error = nil, result if result.is_a?(Exception) # rubocop:disable Style/ParallelAssignment
+      if result.is_a?(Exception)
+        result = nil
+        result_error = result
+      end
 
       job_error = unhandled_error ||
                   result_error ||
@@ -203,8 +206,9 @@ def perform
 
       if unhandled_error && GoodJob.reperform_jobs_on_standard_error
         save!
-      elsif GoodJob.preserve_job_records == true || (GoodJob.preserve_job_records == :on_unhandled_error && unhandled_error)
-        update!(finished_at: Time.current)
+      elsif GoodJob.preserve_job_records == true || (unhandled_error && GoodJob.preserve_job_records == :on_unhandled_error)
+        self.finished_at = Time.current
+        save!
       else
         destroy!
       end