good_job 3.11.1 → 3.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65cb545f93b489c6ee487cbd07924e7a9d4ad2df7d7039391c66f704b38a767d
-  data.tar.gz: 6495c9a4b8da725051e44eb05e0b4c35b6aaa7363075ebb540316ec5a7d0b1b0
+  metadata.gz: 9f74b72eb186eb125e6a130824094f5629124f4a99bcfecbc7e24e3e8b6b0efa
+  data.tar.gz: 31c6b7d98d2d33146794b3c41b25a7ed434f3f7610a427658bc51aa958815057
 SHA512:
-  metadata.gz: 698fbb528da9f58d766ccf47880de2e270f30e2f2226e23adafc00ea7de8920194773fd1769eb40aaff96b2ff3d666c20b080f2ddda801e0979817714bcc93b6
-  data.tar.gz: 42b54be4f42c185531a490d7eae1bc26701c341c1d708167f385505141f62cd860119f52fc32a2a1dab0c6f94817518af51cb629cdff26f5cabfff3a1c61227e
+  metadata.gz: '08d92a2c384a0950749e191bacaa495f120f52a4ce9dfba8e07100d494323dd5692e784565fa301623bb2ec7d378a75a84a76414022a1feeb22cb1362f38fc04'
+  data.tar.gz: e7942e4dbd92be5635d38a6f77722317ee9fa5b1f4f6fac53cf3029230192fa6fc928e97d98f86653dc2f0a41d75223806e1b66492d44f64731ebb48016c6715

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## [v3.12.1](https://github.com/bensheldon/good_job/tree/v3.12.1) (2023-02-09)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.12.0...v3.12.1)
+
+**Fixed bugs:**
+
+- Fix "NoMethodError: private method `\_good\_job\_concurrency\_key' if key is nil" [\#836](https://github.com/bensheldon/good_job/pull/836) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- NoMethodError: private method `\_good\_job\_concurrency\_key' if key is nil [\#835](https://github.com/bensheldon/good_job/issues/835)
+- Jobs go back into the queued state when a worker is killed [\#821](https://github.com/bensheldon/good_job/issues/821)
+
+**Merged pull requests:**
+
+- Dashboard's tables update [\#834](https://github.com/bensheldon/good_job/pull/834) ([Ajmal](https://github.com/Ajmal))
+
+## [v3.12.0](https://github.com/bensheldon/good_job/tree/v3.12.0) (2023-02-07)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.11.1...v3.12.0)
+
+**Implemented enhancements:**
+
+- Create `InterruptErrors` extension to raise an exception when an interrupted job is retried [\#830](https://github.com/bensheldon/good_job/pull/830) ([bensheldon](https://github.com/bensheldon))
+
 ## [v3.11.1](https://github.com/bensheldon/good_job/tree/v3.11.1) (2023-02-06)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v3.11.0...v3.11.1)

data/README.md

@@ -55,6 +55,7 @@ For more of the story of GoodJob, read the [introductory blog post](https://isla
         - [Exceptions](#exceptions)
         - [Retries](#retries)
         - [ActionMailer retries](#actionmailer-retries)
+        - [Interrupts](#interrupts)
     - [Timeouts](#timeouts)
     - [Optimize queues, threads, and processes](#optimize-queues-threads-and-processes)
     - [Database connections](#database-connections)
@@ -829,6 +830,23 @@ end
 Note, that `ActionMailer::MailDeliveryJob` is a default since Rails 6.0. Be sure that your app is using that class, as it
 might also be configured to use (deprecated now) `ActionMailer::DeliveryJob`.
 
+### Interrupts
+
+Jobs will be automatically retried if the process is interrupted while performing a job, for example as the result of a `SIGKILL` or power failure.
+
+If you need more control over interrupt-caused retries, include the `GoodJob::ActiveJobExtensions::InterruptErrors` extension in your job closs. When an interrupted job is retried, the extension will raise a `GoodJob::InterruptError` exception within the job, which allows you to use ActiveJob's `retry_on` and `discard_on` to control the behavior of the job.
+
+```ruby
+class MyJob < ApplicationJob
+  # The extension must be included before other extensions
+  include GoodJob::ActiveJobExtensions::InterruptErrors
+  # Discard the job if it is interrupted
+  discard_on InterruptError
+  # Retry the job if it is interrupted
+  retry_on InterruptError, wait: 0, attempts: Float::INFINITY
+end
+```
+
 ### Timeouts
 
 Job timeouts can be configured with an `around_perform`:

data/app/models/good_job/execution.rb

@@ -315,10 +315,27 @@ module GoodJob
       run_callbacks(:perform) do
         raise PreviouslyPerformedError, 'Cannot perform a job that has already been performed' if finished_at
 
-        self.performed_at = Time.current
-        save! if GoodJob.preserve_job_records
+        result = GoodJob::CurrentThread.within do |current_thread|
+          current_thread.reset
+          current_thread.execution = self
 
-        result = execute
+          current_thread.execution_interrupted = performed_at if performed_at
+          update!(performed_at: Time.current)
+
+          ActiveSupport::Notifications.instrument("perform_job.good_job", { execution: self, process_id: current_thread.process_id, thread_name: current_thread.thread_name }) do
+            value = ActiveJob::Base.execute(active_job_data)
+
+            if value.is_a?(Exception)
+              handled_error = value
+              value = nil
+            end
+            handled_error ||= current_thread.error_on_retry || current_thread.error_on_discard
+
+            ExecutionResult.new(value: value, handled_error: handled_error, retried: current_thread.error_on_retry.present?)
+          rescue StandardError => e
+            ExecutionResult.new(value: nil, unhandled_error: e)
+          end
+        end
 
         job_error = result.handled_error || result.unhandled_error
         self.error = [job_error.class, ERROR_MESSAGE_SEPARATOR, job_error.message].join if job_error
@@ -408,28 +425,6 @@ module GoodJob
       end
     end
 
-    # @return [ExecutionResult]
-    def execute
-      GoodJob::CurrentThread.within do |current_thread|
-        current_thread.reset
-        current_thread.execution = self
-
-        ActiveSupport::Notifications.instrument("perform_job.good_job", { execution: self, process_id: current_thread.process_id, thread_name: current_thread.thread_name }) do
-          value = ActiveJob::Base.execute(active_job_data)
-
-          if value.is_a?(Exception)
-            handled_error = value
-            value = nil
-          end
-          handled_error ||= current_thread.error_on_retry || current_thread.error_on_discard
-
-          ExecutionResult.new(value: value, handled_error: handled_error, retried: current_thread.error_on_retry.present?)
-        rescue StandardError => e
-          ExecutionResult.new(value: nil, unhandled_error: e)
-        end
-      end
-    end
-
     def reset_batch_values(&block)
       GoodJob::Batch.within_thread(batch_id: nil, batch_callback_id: nil, &block)
     end

data/app/views/good_job/batches/_jobs.erb

@@ -3,9 +3,9 @@
       <header class="list-group-item bg-light">
         <div class="row small text-muted text-uppercase align-items-center">
           <div class="col-4">Jobs</div>
-          <div class="d-none d-md-block col-md-1">Queue</div>
-          <div class="d-none d-md-block col-md-1">Priority</div>
-          <div class="d-none d-md-block col-md-1 text-end">Attempts</div>
+          <div class="d-none d-lg-block col-lg-1 text-lg-center">Queue</div>
+          <div class="d-none d-lg-block col-lg-1 text-lg-end">Priority</div>
+          <div class="d-none d-lg-block col-lg-1 text-lg-end">Attempts</div>
           <div class="col text-end">
             <%= tag.button type: "button", class: "btn btn-sm text-muted", role: "button",
                            data: { bs_toggle: "collapse", bs_target: ".job-params" },
@@ -21,18 +21,20 @@
         <% jobs.each do |job| %>
           <div role="row" class="list-group-item list-group-item-action py-3">
             <div class="row align-items-center">
-              <div class="col-md-4">
+              <div class="col-lg-4">
                 <%= tag.code link_to(job.id, job_path(job), class: "small text-muted text-decoration-none") %>
                 <%= tag.h5 tag.code(link_to(job.job_class, job_path(job), class: "text-reset text-decoration-none")), class: "text-reset mb-0" %>
               </div>
-              <div class="col-md-1">
+              <div class="col-4 col-lg-1 text-lg-center">
+                <div class="d-lg-none small text-muted mt-1">Queue</div>
                 <span class="badge bg-primary bg-opacity-25 text-dark font-monospace"><%= job.queue_name %></span>
               </div>
-              <div class="col-md-1 small text-md-center">
+              <div class="col-4 col-lg-1 text-lg-end">
+                <div class="d-lg-none small text-muted mt-1">Priority</div>
                 <span class="font-monospace fw-bold"><%= job.priority %></span>
-                <span class="d-md-none">Priority</span>
               </div>
-              <div class="col-md-1 text-md-center">
+              <div class="col-4 col-lg-1 text-lg-end">
+                <div class="d-lg-none small text-muted mt-1">Attempts</div>
                 <% if job.executions_count > 0 && job.status != :finished %>
                   <%= tag.span job.executions_count, class: "badge rounded-pill bg-danger", data: {
                     bs_toggle: "popover",
@@ -43,13 +45,11 @@
                 <% else %>
                   <span class="badge bg-secondary bg-opacity-50 rounded-pill"><%= job.executions_count %></span>
                 <% end %>
-                <span class="d-md-none small">Attemp</span>
               </div>
-              <div class="col d-flex gap-3 align-items-center justify-content-end">
+              <div class="mt-3 mt-lg-0 col d-flex gap-3 align-items-center justify-content-end">
                 <%= tag.span relative_time(job.last_status_at), class: "small" %>
                 <%= status_badge job.status %>
-              </div>
-              <div class="col-auto">
+
                 <div class="dropdown float-end">
                   <button class="d-flex align-items-center btn btn-sm" type="button" id="<%= dom_id(job, :actions) %>" data-bs-toggle="dropdown" aria-expanded="false">
                     <%= render "good_job/shared/icons/dots" %>
@@ -106,5 +106,5 @@
           No jobs found.
         </div>
       <% end %>
-    </>
+    </div>
   </div>

data/app/views/good_job/batches/_table.erb

@@ -3,11 +3,11 @@
       <header class="list-group-item bg-light">
         <div class="row small text-muted text-uppercase align-items-center">
           <div class="col-4">Name</div>
-          <div class="col-md-1 d-none d-md-block">Created</div>
-          <div class="col-md-1 d-none d-md-block">Enqueued</div>
-          <div class="col-md-1 d-none d-md-block">Discarded</div>
-          <div class="col-md-1 d-none d-md-block">Finished</div>
-          <div class="col-md-1 d-none d-md-block">Jobs</div>
+          <div class="col-lg-1 d-none d-lg-block">Created</div>
+          <div class="col-lg-1 d-none d-lg-block">Enqueued</div>
+          <div class="col-lg-1 d-none d-lg-block">Discarded</div>
+          <div class="col-lg-1 d-none d-lg-block">Finished</div>
+          <div class="col-lg-1 d-none d-lg-block">Jobs</div>
           <div class="col text-end">
             <%= tag.button type: "button", class: "btn btn-sm text-muted", role: "button",
                            data: { bs_toggle: "collapse", bs_target: ".batch-properties" },
@@ -23,7 +23,7 @@
         <% batches.each do |batch| %>
           <div id="<%= dom_id(batch) %>" class="list-group-item py-3" role="row">
             <div class="row align-items-center">
-              <div class="col-4">
+              <div class="col-12 col-lg-4">
                 <%= link_to batch_path(batch), class: "text-decoration-none" do %>
                   <code class="small text-muted">
                     <%= batch.id %>
@@ -32,34 +32,34 @@
                   <div class="text-muted"><%= batch.description %></div>
                 <% end %>
               </div>
-              <div class="col-md-1 text-wrap">
-                <div class="d-md-none small text-muted mt-1">Created at</div>
+              <div class="col-6 col-lg-1 text-wrap">
+                <div class="d-lg-none small text-muted mt-1">Created at</div>
                 <%= relative_time(batch.created_at) %>
               </div>
-              <div class="col-md-1 text-wrap">
+              <div class="col-6 col-lg-1 text-wrap">
                 <% if batch.enqueued_at %>
-                  <div class="d-md-none small text-muted mt-1">Enqueued at</div>
+                  <div class="d-lg-none small text-muted mt-1">Enqueued at</div>
                   <%= relative_time(batch.enqueued_at) %>
                 <% end %>
               </div>
-              <div class="col-md-1 text-wrap">
+              <div class="col-6 col-lg-1 text-wrap">
                 <% if batch.discarded_at %>
-                  <div class="d-md-none small text-muted mt-1">Discarded at</div>
+                  <div class="d-lg-none small text-muted mt-1">Discarded at</div>
                   <%= relative_time(batch.discarded_at) %>
                 <% end %>
               </div>
-              <div class="col-md-1 text-wrap">
+              <div class="col-6 col-lg-1 text-wrap">
                 <% if batch.finished_at %>
-                  <div class="d-md-none small text-muted mt-1">Finished at</div>
+                  <div class="d-lg-none small text-muted mt-1">Finished at</div>
                   <%= relative_time(batch.finished_at) %>
                 <% end %>
               </div>
-              <div class="col">
-                <div class="d-md-none small text-muted mt-1">Jobs</div>
+              <div class="col-6 col-lg-1">
+                <div class="d-lg-none small text-muted mt-1">Jobs</div>
                 <%= batch.jobs.count %>
               </div>
               <div class="col text-end">
-                <%= tag.button type: "button", class: "btn btn-sm text-muted ms-auto", role: "button",
+                <%= tag.button type: "button", class: "btn btn-sm text-muted", role: "button",
                                title: "Inspect",
                                data: { bs_toggle: "collapse", bs_target: "##{dom_id(batch, 'properties')}" },
                                aria: { expanded: false, controls: dom_id(batch, "state") } do %>

data/app/views/good_job/cron_entries/index.html.erb

@@ -6,11 +6,11 @@
   <div class="list-group list-group-flush text-nowrap" role="table">
     <header class="list-group-item bg-light">
       <div class="row small text-muted text-uppercase align-items-center">
-        <div class="col"></div>
-        <div class="col">Class</div>
-        <div class="col">Schedule</div>
-        <div class="col">Next scheduled</div>
-        <div class="col">Last run</div>
+        <div class="col-12 col-lg-2"></div>
+        <div class="col-6 col-lg-2 d-none d-lg-block">Class</div>
+        <div class="col-6 col-lg-2 d-none d-lg-block">Schedule</div>
+        <div class="col-6 col-lg-2 d-none d-lg-block">Next scheduled</div>
+        <div class="col-6 col-lg-2 d-none d-lg-block">Last run</div>
         <div class="col text-end">
           <%= tag.button type: "button", class: "btn btn-sm text-muted", role: "button",
                          data: { bs_toggle: "collapse", bs_target: ".cron-entry-properties" },
@@ -24,15 +24,22 @@
     <% @cron_entries.each do |cron_entry| %>
       <div id="<%= dom_id(cron_entry) %>" class="list-group-item py-3" role="row">
         <div class="row align-items-center">
-          <div class="col">
+          <div class="col-12 col-lg-2">
             <div class="small font-monospace"><%= cron_entry.key %></div>
-            <div class="small text-muted"><%= cron_entry.description %></div>
+            <div class="small text-muted text-wrap"><%= cron_entry.description %></div>
           </div>
-          <div class="col"><%= tag.span tag.code(cron_entry.job_class), class: "fs-5 mb-0" %></div>
-          <div class="col font-monospace fw-bold"><%= cron_entry.schedule %></div>
-          <div class="col small"><%= relative_time cron_entry.next_at %></div>
-          <div class="col small">
+          <div class="col-12 col-lg-2 text-wrap"><%= tag.span tag.code(cron_entry.job_class), class: "fs-5 mb-0" %></div>
+          <div class="col-6 col-lg-2 text-wrap">
+            <div class="d-lg-none small text-muted mt-1">Schedule</div>
+            <span class="font-monospace fw-bold"><%= cron_entry.schedule %></span>
+          </div>
+          <div class="col-6 col-lg-2 text-wrap small">
+            <div class="d-lg-none small text-muted mt-1">Next scheduled</div>
+            <%= relative_time cron_entry.next_at %>
+          </div>
+          <div class="col-6 col-lg-2 text-wrap small">
             <% if cron_entry.last_job.present? %>
+              <div class="d-lg-none small text-muted mt-1">Last run</div>
               <%= link_to relative_time(cron_entry.last_at), cron_entry_path(cron_entry), title: "Job #{cron_entry.last_job.id}" %>
             <% end %>
           </div>

data/app/views/good_job/jobs/_executions.erb

@@ -23,7 +23,7 @@
               <%= tag.span relative_time(execution.last_status_at, include_seconds: true), class: "small" %>
               <%= status_badge execution.status %>
             
-              <%= tag.button type: "button", class: "btn btn-sm text-muted ms-auto", role: "button",
+              <%= tag.button type: "button", class: "btn btn-sm text-muted", role: "button",
                 title: "Inspect",
                 data: { bs_toggle: "collapse", bs_target: "##{dom_id(execution, 'params')}" },
                 aria: { expanded: false, controls: dom_id(execution, "params") } do %>

data/app/views/good_job/jobs/_table.erb

@@ -3,12 +3,11 @@
   <div class="list-group list-group-flush text-nowrap table-jobs" role="table">
     <header class="list-group-item bg-light">
       <div class="row small text-muted text-uppercase align-items-center">
-        <div class="col-auto">
+        <div class="col-lg-4 d-flex gap-2 flex-wrap">
           <%= label_tag('toggle_job_ids', "Toggle all jobs", class: "visually-hidden") %>
           <%= check_box_tag('toggle_job_ids', "1", false, data: { "checkbox-toggle-all": "job_ids" }) %>
-        </div>
-        <div class="col-md-4">
-          <%= form.button type: 'submit', name: 'mass_action', value: 'reschedule', class: 'btn btn-sm btn-outline-secondary', title: "Reschedule all", data: { confirm: "Are you sure you want to reschedule the selected jobs?", disable: true } do %>
+
+          <%= form.button type: 'submit', name: 'mass_action', value: 'reschedule', class: 'ms-1 btn btn-sm btn-outline-secondary', title: "Reschedule all", data: { confirm: "Are you sure you want to reschedule the selected jobs?", disable: true } do %>
             <span class="me-1"><%= render_icon "skip_forward" %></span> Reschedule
           <% end %>
 
@@ -33,9 +32,9 @@
           </div>
 
         </div>
-        <div class="d-none d-md-block col-md-1">Queue</div>
-        <div class="d-none d-md-block col-md-1">Priority</div>
-        <div class="d-none d-md-block col-md-1 text-end">Attempts</div>
+        <div class="d-none d-lg-block col-lg-1 text-lg-center">Queue</div>
+        <div class="d-none d-lg-block col-lg-1 text-lg-end">Priority</div>
+        <div class="d-none d-lg-block col-lg-1 text-lg-end">Attempts</div>
         <div class="col text-end">
           <%= tag.button type: "button", class: "btn btn-sm text-muted", role: "button",
                   data: { bs_toggle: "collapse", bs_target: ".job-params" },
@@ -61,21 +60,23 @@
       <% jobs.each do |job| %>
         <%= label_tag dom_id(job, :checkbox), id: dom_id(job), role: "row", class: "list-group-item list-group-item-action py-3" do %>
           <div class="row align-items-center">
-            <div class="col-auto">
+            <div class="col-lg-4 d-flex">
               <%= check_box_tag 'job_ids[]', job.id, false, id: dom_id(job, :checkbox), data: { "checkbox-toggle-each": "job_ids" } %>
+              <div class="ms-2">
+                <%= tag.code link_to(job.id, job_path(job), class: "small text-muted text-decoration-none") %>
+                <%= tag.h5 tag.code(link_to(job.job_class, job_path(job), class: "text-reset text-decoration-none")), class: "text-reset mb-0" %>
+              </div>
             </div>
-            <div class="col-md-4">
-              <%= tag.code link_to(job.id, job_path(job), class: "small text-muted text-decoration-none") %>
-              <%= tag.h5 tag.code(link_to(job.job_class, job_path(job), class: "text-reset text-decoration-none")), class: "text-reset mb-0" %>
-            </div>
-            <div class="col-md-1">
+            <div class="col-4 col-lg-1 text-lg-center">
+              <div class="d-lg-none small text-muted mt-1">Queue</div>
               <span class="badge bg-primary bg-opacity-25 text-dark font-monospace"><%= job.queue_name %></span>
             </div>
-            <div class="col-md-1 small text-md-center">
-              <span class="font-monospace fw-bold"><%= job.priority %></span>
-              <span class="d-md-none">Priority</span>
+            <div class="col-4 col-lg-1 text-lg-end">
+              <div class="d-lg-none small text-muted mt-1">Priority</div>
+              <%= job.priority %>
             </div>
-            <div class="col-md-1 text-md-center">
+            <div class="col-4 col-lg-1 text-lg-end">
+              <div class="d-lg-none small text-muted mt-1">Attempts</div>
               <% if job.executions_count > 0 && job.status != :succeeded %>
                 <%= tag.span job.executions_count, class: "badge rounded-pill bg-danger", data: {
                       bs_toggle: "popover",
@@ -86,56 +87,56 @@
               <% else %>
                 <span class="badge bg-secondary bg-opacity-50 rounded-pill"><%= job.executions_count %></span>
               <% end %>
-              <span class="d-md-none small">Attemp</span>
-            </div>
-            <div class="col d-flex gap-3 align-items-center justify-content-end">
-              <%= tag.span relative_time(job.last_status_at), class: "small" %>
-              <%= status_badge job.status %>
             </div>
-            <div class="col-auto">
-              <div class="dropdown float-end">
-                <button class="d-flex align-items-center btn btn-sm" type="button" id="<%= dom_id(job, :actions) %>" data-bs-toggle="dropdown" aria-expanded="false">
-                  <%= render "good_job/shared/icons/dots" %>
-                  <span class="visually-hidden">Actions</span>
-                </button>
-                <ul class="dropdown-menu shadow" aria-labelledby="<%= dom_id(job, :actions) %>">
-                  <li>
-                    <% job_reschedulable = job.status.in? [:scheduled, :retried, :queued] %>
-                    <%= link_to reschedule_job_path(job.id), method: :put, class: "dropdown-item #{'disabled' unless job_reschedulable}", title: "Reschedule job", data: { confirm: "Confirm reschedule", disable: true } do %>
-                      <%= render "good_job/shared/icons/skip_forward" %>
-                      Reschedule
-                    <% end %>
-                  </li>
-                  <li>
-                    <% job_discardable = job.status.in? [:scheduled, :retried, :queued] %>
-                    <%= link_to discard_job_path(job.id), method: :put, class: "dropdown-item #{'disabled' unless job_discardable}", title: "Discard job", data: { confirm: "Confirm discard", disable: true } do %>
-                      <%= render "good_job/shared/icons/stop" %>
-                      Discard
-                    <% end %>
-                  </li>
-                  <li>
-                    <%= link_to retry_job_path(job.id), method: :put, class: "dropdown-item #{'disabled' unless job.status == :discarded}", title: "Retry job", data: { confirm: "Confirm retry", disable: true } do %>
-                      <%= render "good_job/shared/icons/arrow_clockwise" %>
-                      Retry
-                    <% end %>
-                  </li>
-                  <li>
-                    <%= link_to job_path(job.id), method: :delete, class: "dropdown-item #{'disabled' unless job.status.in? [:discarded, :succeeded]}", title: "Destroy job", data: { confirm: "Confirm destroy", disable: true } do %>
-                      <%= render_icon "trash" %>
-                      Destroy
-                    <% end %>
-                  </li>
+            <div class="mt-3 mt-lg-0 col">
+              <div class="d-flex gap-3 align-items-center justify-content-end">
+                <%= tag.span relative_time(job.last_status_at), class: "small" %>
+                <%= status_badge job.status %>
+
+                <div class="dropdown float-end">
+                  <button class="d-flex align-items-center btn btn-sm" type="button" id="<%= dom_id(job, :actions) %>" data-bs-toggle="dropdown" aria-expanded="false">
+                    <%= render "good_job/shared/icons/dots" %>
+                    <span class="visually-hidden">Actions</span>
+                  </button>
+                  <ul class="dropdown-menu shadow" aria-labelledby="<%= dom_id(job, :actions) %>">
+                    <li>
+                      <% job_reschedulable = job.status.in? [:scheduled, :retried, :queued] %>
+                      <%= link_to reschedule_job_path(job.id), method: :put, class: "dropdown-item #{'disabled' unless job_reschedulable}", title: "Reschedule job", data: { confirm: "Confirm reschedule", disable: true } do %>
+                        <%= render "good_job/shared/icons/skip_forward" %>
+                        Reschedule
+                      <% end %>
+                    </li>
+                    <li>
+                      <% job_discardable = job.status.in? [:scheduled, :retried, :queued] %>
+                      <%= link_to discard_job_path(job.id), method: :put, class: "dropdown-item #{'disabled' unless job_discardable}", title: "Discard job", data: { confirm: "Confirm discard", disable: true } do %>
+                        <%= render "good_job/shared/icons/stop" %>
+                        Discard
+                      <% end %>
+                    </li>
+                    <li>
+                      <%= link_to retry_job_path(job.id), method: :put, class: "dropdown-item #{'disabled' unless job.status == :discarded}", title: "Retry job", data: { confirm: "Confirm retry", disable: true } do %>
+                        <%= render "good_job/shared/icons/arrow_clockwise" %>
+                        Retry
+                      <% end %>
+                    </li>
+                    <li>
+                      <%= link_to job_path(job.id), method: :delete, class: "dropdown-item #{'disabled' unless job.status.in? [:discarded, :succeeded]}", title: "Destroy job", data: { confirm: "Confirm destroy", disable: true } do %>
+                        <%= render_icon "trash" %>
+                        Destroy
+                      <% end %>
+                    </li>
 
-                  <li>
-                    <%= link_to "##{dom_id(job, 'params')}",
-                      class: "dropdown-item",
-                      data: { bs_toggle: "collapse" },
-                      aria: { expanded: false, controls: dom_id(job, "params") } do %>
-                      <%= render_icon "info" %>
-                      Inspect
-                    <% end %>
-                  </li>
-                </ul>
+                    <li>
+                      <%= link_to "##{dom_id(job, 'params')}",
+                        class: "dropdown-item",
+                        data: { bs_toggle: "collapse" },
+                        aria: { expanded: false, controls: dom_id(job, "params") } do %>
+                        <%= render_icon "info" %>
+                        Inspect
+                      <% end %>
+                    </li>
+                  </ul>
+                </div>
               </div>
             </div>
           </div>

data/lib/good_job/active_job_extensions/concurrency.rb

@@ -86,6 +86,18 @@ module GoodJob
         @good_job_concurrency_key || _good_job_concurrency_key
       end
 
+      # Generates the concurrency key from the configuration
+      # @return [Object] concurrency key
+      def _good_job_concurrency_key
+        key = self.class.good_job_concurrency_config[:key]
+        return if key.blank?
+
+        key = key.respond_to?(:call) ? instance_exec(&key) : key
+        raise TypeError, "Concurrency key must be a String; was a #{key.class}" unless VALID_TYPES.any? { |type| key.is_a?(type) }
+
+        key
+      end
+
       private
 
       def good_job_enqueue_concurrency_check(job, on_abort:, on_enqueue:)
@@ -129,18 +141,6 @@ module GoodJob
           end
         end
       end
-
-      # Generates the concurrency key from the configuration
-      # @return [Object] concurrency key
-      def _good_job_concurrency_key
-        key = self.class.good_job_concurrency_config[:key]
-        return if key.blank?
-
-        key = key.respond_to?(:call) ? instance_exec(&key) : key
-        raise TypeError, "Concurrency key must be a String; was a #{key.class}" unless VALID_TYPES.any? { |type| key.is_a?(type) }
-
-        key
-      end
     end
   end
 end

data/lib/good_job/active_job_extensions/interrupt_errors.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+module GoodJob
+  module ActiveJobExtensions
+    module InterruptErrors
+      extend ActiveSupport::Concern
+
+      included do
+        around_perform do |_job, block|
+          raise InterruptError, "Interrupted after starting perform at '#{CurrentThread.execution_interrupted}'" if CurrentThread.execution_interrupted.present?
+
+          block.call
+        end
+      end
+    end
+  end
+end

data/lib/good_job/current_thread.rb

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

data/lib/good_job/interrupt_error.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+module GoodJob
+  # Exception raised when a job is interrupted by a SIGKILL or power failure.
+  class InterruptError < StandardError
+  end
+end

data/lib/good_job/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module GoodJob
   # GoodJob gem version.
-  VERSION = '3.11.1'
+  VERSION = '3.12.1'
 end

data/lib/good_job.rb

@@ -9,6 +9,8 @@ require "good_job/adapter"
 require "active_job/queue_adapters/good_job_adapter"
 require "good_job/active_job_extensions/batches"
 require "good_job/active_job_extensions/concurrency"
+require "good_job/interrupt_error"
+require "good_job/active_job_extensions/interrupt_errors"
 require "good_job/active_job_extensions/notify_options"
 
 require "good_job/assignable_connection"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 3.11.1
+  version: 3.12.1
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-06 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -403,6 +403,7 @@ files:
 - lib/good_job.rb
 - lib/good_job/active_job_extensions/batches.rb
 - lib/good_job/active_job_extensions/concurrency.rb
+- lib/good_job/active_job_extensions/interrupt_errors.rb
 - lib/good_job/active_job_extensions/notify_options.rb
 - lib/good_job/adapter.rb
 - lib/good_job/assignable_connection.rb
@@ -415,6 +416,7 @@ files:
 - lib/good_job/daemon.rb
 - lib/good_job/dependencies.rb
 - lib/good_job/engine.rb
+- lib/good_job/interrupt_error.rb
 - lib/good_job/job_performer.rb
 - lib/good_job/log_subscriber.rb
 - lib/good_job/multi_scheduler.rb