good_job 2.9.5 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c65c653e99d224dcc5803bd851fbc8891ecafd9634c68e4b0feaee08eafc1ed0
-  data.tar.gz: 6b6d8a61555bfacdf6ba82e69afa48a3d05c1c9d9239770cea86878067151727
+  metadata.gz: 4722bcae4ba953937f1e78dd730c61898ec0aa25e4c8d5fedc6163e218de4381
+  data.tar.gz: fe659df13800eadf8f8d45a2d31b4b4dd466d0f9517addefdfd5169c351c7c76
 SHA512:
-  metadata.gz: 9135ae904e9031c97d9029af23d15b504b03383fbff4c43634416199a130d04ddafbd121ababe7f9675d997d1b5be8db37d098e060f4a51193035abe087052c8
-  data.tar.gz: 30235ec67f81832b6c9b7401a01c7e167d239fef9d38b5be4d83d56c98cb061bb8737432092bce7e18e7136f67c4df14dc917f83c227f3d0e83b578b9fe58468
+  metadata.gz: 3fff2b35292aebd982e6a11fac22d9a16b2468a19bf4e50c354a3f6806831fbcb2ab07d5cbe74c4ccd6bbeeb178abeeee700da0dbfdb0281f79b173b22a2ce9a
+  data.tar.gz: ea88184a6b3b3be56604b90af426c4c491f735dc5951854710bfeda55a1c4b930b76190845cb90b512d4e9e2f9a1f3b746478f232d10529c8a6971e448ab1419

data/CHANGELOG.md

@@ -1,5 +1,45 @@
 # Changelog
 
+## [v2.11.0](https://github.com/bensheldon/good_job/tree/v2.11.0) (2022-02-27)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v2.10.0...v2.11.0)
+
+**Closed issues:**
+
+- How do I ensure that a the same job can't run twice? \(unique job / avoid duplicates\) [\#531](https://github.com/bensheldon/good_job/issues/531)
+- Bulk reschedule and discard jobs via dashboard [\#527](https://github.com/bensheldon/good_job/issues/527)
+- "Live Poll" dashboard [\#526](https://github.com/bensheldon/good_job/issues/526)
+
+**Merged pull requests:**
+
+- Add support for live polling the dashboard [\#528](https://github.com/bensheldon/good_job/pull/528) ([danielwestendorf](https://github.com/danielwestendorf))
+
+## [v2.10.0](https://github.com/bensheldon/good_job/tree/v2.10.0) (2022-02-18)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v2.9.6...v2.10.0)
+
+**Closed issues:**
+
+- Cron jobs not getting run [\#519](https://github.com/bensheldon/good_job/issues/519)
+- Slow queries with many finished entries and concurrency control [\#514](https://github.com/bensheldon/good_job/issues/514)
+- Make default retry behaviour safer [\#505](https://github.com/bensheldon/good_job/issues/505)
+
+**Merged pull requests:**
+
+- Fix Benchmark job throughput script   [\#522](https://github.com/bensheldon/good_job/pull/522) ([douglara](https://github.com/douglara))
+- Update development Gemfile.lock [\#521](https://github.com/bensheldon/good_job/pull/521) ([bensheldon](https://github.com/bensheldon))
+- Ensure Rails 6.0 is tested against Ruby 3.0; use Ruby 3.0 in demo environment [\#520](https://github.com/bensheldon/good_job/pull/520) ([bensheldon](https://github.com/bensheldon))
+- Dashboard: update search filters and some small UI updates [\#518](https://github.com/bensheldon/good_job/pull/518) ([multiplegeorges](https://github.com/multiplegeorges))
+- Document safer setting for retry\_on\_unhandled\_error [\#517](https://github.com/bensheldon/good_job/pull/517) ([tamaloa](https://github.com/tamaloa))
+
+## [v2.9.6](https://github.com/bensheldon/good_job/tree/v2.9.6) (2022-02-07)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v2.9.5...v2.9.6)
+
+**Merged pull requests:**
+
+- Limit query for allowed concurrent jobs to unfinished [\#515](https://github.com/bensheldon/good_job/pull/515) ([til](https://github.com/til))
+
 ## [v2.9.5](https://github.com/bensheldon/good_job/tree/v2.9.5) (2022-02-07)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v2.9.4...v2.9.5)

data/README.md

@@ -276,7 +276,7 @@ Available configuration options are:
 - `cleanup_interval_seconds` (integer) Number of seconds a Scheduler will wait before cleaning up preserved jobs. Defaults to `nil`. Can also be set with  the environment variable `GOOD_JOB_CLEANUP_INTERVAL_SECONDS`.
 - `logger` ([Rails Logger](https://api.rubyonrails.org/classes/ActiveSupport/Logger.html)) lets you set a custom logger for GoodJob. It should be an instance of a Rails `Logger` (Default: `Rails.logger`).
 - `preserve_job_records` (boolean) keeps job records in your database even after jobs are completed. (Default: `false`)
-- `retry_on_unhandled_error` (boolean) causes jobs to be re-queued and retried if they raise an instance of `StandardError`. Instances of `Exception`, like SIGINT, will *always* be retried, regardless of this attribute’s value. (Default: `true`)
+- `retry_on_unhandled_error` (boolean) causes jobs to be re-queued and retried if they raise an instance of `StandardError`. Be advised this may lead to jobs being repeated infinitely ([see below for more on retries](#retries)). Instances of `Exception`, like SIGINT, will *always* be retried, regardless of this attribute’s value. (Default: `true`)
 - `on_thread_error` (proc, lambda, or callable) will be called when an Exception. It can be useful for logging errors to bug tracking services, like Sentry or Airbrake. Example:
 
     ```ruby
@@ -307,7 +307,7 @@ Good Job’s general behavior can also be configured via attributes directly on
 - **`GoodJob.active_record_parent_class`** (string) The ActiveRecord parent class inherited by GoodJob's ActiveRecord model `GoodJob::Job` (defaults to `"ActiveRecord::Base"`). Configure this when using [multiple databases with ActiveRecord](https://guides.rubyonrails.org/active_record_multiple_databases.html) or when other custom configuration is necessary for the ActiveRecord model to connect to the Postgres database. _The value must be a String to avoid premature initialization of ActiveRecord._
 - **`GoodJob.logger`** ([Rails Logger](https://api.rubyonrails.org/classes/ActiveSupport/Logger.html)) lets you set a custom logger for GoodJob. It should be an instance of a Rails `Logger`.
 - **`GoodJob.preserve_job_records`** (boolean) keeps job records in your database even after jobs are completed. (Default: `false`)
-- **`GoodJob.retry_on_unhandled_error`** (boolean) causes jobs to be re-queued and retried if they raise an instance of `StandardError`. Instances of `Exception`, like SIGINT, will *always* be retried, regardless of this attribute’s value. (Default: `true`)
+- **`GoodJob.retry_on_unhandled_error`** (boolean) causes jobs to be re-queued and retried if they raise an instance of `StandardError`. Be advised this may lead to jobs being repeated infinitely ([see below for more on retries](#retries)). Instances of `Exception`, like SIGINT, will *always* be retried, regardless of this attribute’s value. (Default: `true`)
 - **`GoodJob.on_thread_error`** (proc, lambda, or callable) will be called when an Exception. It can be useful for logging errors to bug tracking services, like Sentry or Airbrake.
 
 You’ll generally want to configure these in `config/initializers/good_job.rb`, like so:
@@ -369,6 +369,10 @@ GoodJob includes a Dashboard as a mountable `Rails::Engine`.
     end
     ```
 
+#### Live Polling
+
+The Dashboard can be set to automatically refresh by checking "Live Poll" in the Dashboard header, or by setting `?poll=10` with the interval in seconds (default 30 seconds).
+
 ### ActiveJob concurrency
 
 GoodJob can extend ActiveJob to provide limits on concurrently running jobs, either at time of _enqueue_ or at _perform_. Limiting concurrency can help prevent duplicate, double or unecessary jobs from being enqueued, or race conditions when performing, for example when interacting with 3rd-party APIs.
@@ -529,7 +533,7 @@ class ApplicationJob < ActiveJob::Base
 end
 ```
 
-When using `retry_on` with _a limited number of retries_, the final exception will not be rescued and will raise to GoodJob. GoodJob can be configured to discard un-handled exceptions instead of retrying them:
+When using `retry_on` with _a limited number of retries_, the final exception will not be rescued and will raise to GoodJob. GoodJob can be configured to discard un-handled exceptions instead of retrying them. Be aware that if NOT setting `retry_on_unhandled_error` to `false` good_job will by default retry the failing job and may do this infinitely without pause thereby at least causing high load. In most cases `retry_on_unhandled_error` should be set as following:
 
 ```ruby
 # config/initializers/good_job.rb

data/engine/app/assets/scripts.js

@@ -1 +1,133 @@
-GoodJob = {};
+/*jshint esversion: 6, strict: false */
+const GOOD_JOB_DEFAULT_POLL_INTERVAL_SECONDS = 30;
+const GOOD_JOB_MINIMUM_POLL_INTERVAL = 1000;
+
+const GoodJob = {
+  // Register functions to execute when the DOM is ready
+  ready: (callback) => {
+    if (document.readyState !== "loading") {
+      callback();
+    } else {
+      document.addEventListener("DOMContentLoaded", callback);
+    }
+  },
+
+  init: () => {
+    GoodJob.updateSettings();
+    GoodJob.addListeners();
+    GoodJob.pollUpdates();
+    GoodJob.renderCharts(true);
+  },
+
+  addListeners: () => {
+    const gjActionEls = document.querySelectorAll('[data-gj-action]');
+
+    for (let i = 0; i < gjActionEls.length; i++) {
+      const el = gjActionEls[i];
+      const [eventName, func] = el.dataset.gjAction.split('#');
+
+      el.addEventListener(eventName, GoodJob[func]);
+    }
+  },
+
+  updateSettings: () => {
+    const queryString = window.location.search;
+    const urlParams = new URLSearchParams(queryString);
+
+    // live poll interval and enablement
+    if (urlParams.has('poll')) {
+      const parsedInterval = (parseInt(urlParams.get('poll')) || GOOD_JOB_DEFAULT_POLL_INTERVAL_SECONDS) * 1000;
+
+      GoodJob.pollEnabled = true;
+      GoodJob.pollInterval = Math.max(parsedInterval, GOOD_JOB_MINIMUM_POLL_INTERVAL);
+      GoodJob.setStorage('pollInterval', GoodJob.pollInterval);
+    } else {
+      GoodJob.pollEnabled = GoodJob.getStorage('pollEnabled') || false;
+      GoodJob.pollInterval = GoodJob.getStorage('pollInterval') || GOOD_JOB_DEFAULT_POLL_INTERVAL_SECONDS;
+    }
+
+    document.getElementById('toggle-poll').checked = GoodJob.pollEnabled;
+  },
+
+  togglePoll: (ev) => {
+    GoodJob.pollEnabled = ev.currentTarget.checked;
+    GoodJob.setStorage('pollEnabled', GoodJob.pollEnabled);
+  },
+
+  pollUpdates: () => {
+    setTimeout(() => {
+      if (GoodJob.pollEnabled === true) {
+        fetch(window.location.href)
+          .then(resp => resp.text())
+          .then(GoodJob.updateContent)
+          .finally(GoodJob.pollUpdates);
+      } else {
+        GoodJob.pollUpdates();
+      }
+    }, GoodJob.pollInterval);
+  },
+
+  updateContent: (newContent) => {
+    const domParser = new DOMParser();
+    const parsedDOM = domParser.parseFromString(newContent, "text/html");
+
+    const newElements = parsedDOM.querySelectorAll('[data-gj-poll-replace]');
+
+    for (let i = 0; i < newElements.length; i++) {
+      const newEl = newElements[i];
+      const oldEl = document.getElementById(newEl.id);
+
+      if (oldEl) {
+        oldEl.replaceWith(newEl);
+      }
+    }
+
+    GoodJob.renderCharts(false);
+  },
+
+  renderCharts: (animate) => {
+    const charts = document.querySelectorAll('.chart');
+
+    for (let i = 0; i < charts.length; i++) {
+      const chartEl = charts[i];
+      const chartData = JSON.parse(chartEl.dataset.json);
+
+      const ctx = chartEl.getContext('2d');
+      const chart = new Chart(ctx, {
+        type: 'line',
+        data: {
+          labels: chartData.labels,
+          datasets: chartData.datasets
+        },
+        options: {
+          animation: animate,
+          responsive: true,
+          maintainAspectRatio: false,
+          scales: {
+            y: {
+              beginAtZero: true
+            }
+          }
+        }
+      });
+    }
+  },
+
+  getStorage: (key) => {
+    const value = localStorage.getItem('good_job-' + key);
+
+    if (value === 'true') {
+      return true;
+    } else if (value === 'false') {
+      return false;
+    } else {
+      return value;
+    }
+  },
+
+  setStorage: (key, value) => {
+    localStorage.setItem('good_job-' + key, value);
+  }
+};
+
+GoodJob.ready(GoodJob.init);

data/engine/app/filters/good_job/executions_filter.rb

@@ -2,7 +2,7 @@
 module GoodJob
   class ExecutionsFilter < BaseFilter
     def states
-      {
+      @_states ||= {
         'finished' => base_query.finished.count,
         'unfinished' => base_query.unfinished.count,
         'running' => base_query.running.count,

data/engine/app/helpers/good_job/application_helper.rb

@@ -5,5 +5,20 @@ module GoodJob
       text = timestamp.future? ? "in #{time_ago_in_words(timestamp)}" : "#{time_ago_in_words(timestamp)} ago"
       tag.time(text, datetime: timestamp, title: timestamp)
     end
+
+    def status_badge(status)
+      classes = case status
+                when :finished
+                  "badge rounded-pill bg-success"
+                when :queued, :scheduled, :retried
+                  "badge rounded-pill bg-secondary"
+                when :running
+                  "badge rounded-pill bg-primary"
+                when :discarded
+                  "badge rounded-pill bg-danger"
+                end
+
+      content_tag :span, status.to_s, class: classes
+    end
   end
 end

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

@@ -1,3 +1,7 @@
+<div class="my-3 flex">
+  <h2>Cron Schedules</h2>
+</div>
+
 <% if @cron_entries.present? %>
   <div class="card my-3">
     <div class="table-responsive">
@@ -47,5 +51,11 @@
     </div>
   </div>
 <% else %>
-  <em>No cron schedules present.</em>
+  <div class="card my-3">
+    <div class="card-body">
+      <p class="card-text">
+        <em>No cron schedules found.</em>
+      </p>
+    </div>
+  </div>
 <% end %>

data/engine/app/views/good_job/executions/_table.erb

@@ -1,6 +1,6 @@
-<div class="card my-3">
+<div class="card my-3" data-gj-poll-replace id="executions-table">
   <div class="table-responsive">
-    <table class="table card-table table-bordered table-hover table-sm mb-0">
+    <table class="table card-table table-bordered table-hover table-sm mb-0" id="executions_index_table">
       <thead>
         <tr>
           <th>ActiveJob ID</th>
@@ -20,34 +20,40 @@
         </tr>
       </thead>
       <tbody>
-        <% executions.each do |execution| %>
-          <tr id="<%= dom_id(execution) %>">
-            <td>
-              <%= link_to job_path(execution.serialized_params['job_id']) do %>
-                <code><%= execution.active_job_id %></code>
-              <% end %>
-            </td>
-            <td>
-              <%= link_to job_path(execution.active_job_id, anchor: dom_id(execution)) do %>
-                <code><%= execution.id %></code>
-              <% end %>
-            </td>
-            <td><%= execution.serialized_params['job_class'] %></td>
-            <td><%= execution.queue_name %></td>
-            <td><%= relative_time(execution.scheduled_at || execution.created_at) %></td>
-            <td class="text-break"><%= truncate(execution.error, length: 1_000) %></td>
-            <td>
-              <%= tag.button "Preview", type: "button", class: "btn btn-sm btn-outline-primary", role: "button",
-                data: { bs_toggle: "collapse", bs_target: "##{dom_id(execution, 'params')}" },
-                aria: { expanded: false, controls: dom_id(execution, "params") }
-              %>
-              <%= tag.pre JSON.pretty_generate(execution.serialized_params), id: dom_id(execution, "params"), class: "collapse job-params" %>
-            </td>
-            <td>
-              <%= button_to execution_path(execution.id), method: :delete, class: "btn btn-sm btn-outline-danger", title: "Delete execution", data: { confirm: "Confirm delete" } do %>
-                <%= render "good_job/shared/icons/trash" %>
-              <% end %>
-            </td>
+        <% if executions.present? %>
+          <% executions.each do |execution| %>
+            <tr id="<%= dom_id(execution) %>">
+              <td>
+                <%= link_to job_path(execution.serialized_params['job_id']) do %>
+                  <code><%= execution.active_job_id %></code>
+                <% end %>
+              </td>
+              <td>
+                <%= link_to job_path(execution.active_job_id, anchor: dom_id(execution)) do %>
+                  <code><%= execution.id %></code>
+                <% end %>
+              </td>
+              <td><%= execution.serialized_params['job_class'] %></td>
+              <td><%= execution.queue_name %></td>
+              <td><%= relative_time(execution.scheduled_at || execution.created_at) %></td>
+              <td class="text-break"><%= truncate(execution.error, length: 1_000) %></td>
+              <td>
+                <%= tag.button "Preview", type: "button", class: "btn btn-sm btn-outline-primary", role: "button",
+                  data: { bs_toggle: "collapse", bs_target: "##{dom_id(execution, 'params')}" },
+                  aria: { expanded: false, controls: dom_id(execution, "params") }
+                %>
+                <%= tag.pre JSON.pretty_generate(execution.serialized_params), id: dom_id(execution, "params"), class: "collapse job-params" %>
+              </td>
+              <td>
+                <%= button_to execution_path(execution.id), method: :delete, class: "btn btn-sm btn-outline-danger", title: "Delete execution", data: { confirm: "Confirm delete" } do %>
+                  <%= render "good_job/shared/icons/trash" %>
+                <% end %>
+              </td>
+            </tr>
+          <% end %>
+        <% else %>
+          <tr>
+            <td colspan="8" class="py-2 text-center text-muted">No executions found.</td>
           </tr>
         <% end %>
       </tbody>

data/engine/app/views/good_job/executions/index.html.erb

@@ -1,13 +1,13 @@
-<div class="card my-3 p-6">
+<div class="card my-3 p-6" data-gj-poll-replace id="executions-chart">
   <%= render 'good_job/shared/chart', chart_data: GoodJob::ScheduledByQueueChart.new(@filter).data %>
 </div>
 
 <%= render 'good_job/shared/filter', filter: @filter %>
 
-<% if @filter.records.present? %>
-  <%= render 'good_job/executions/table', executions: @filter.records %>
+<%= render 'good_job/executions/table', executions: @filter.records %>
 
-  <nav aria-label="Job pagination" class="mt-3">
+<% if @filter.records.present? %>
+  <nav aria-label="Job pagination" class="mt-3" data-gj-poll-replace id="executions-pagination">
     <ul class="pagination">
       <li class="page-item">
         <%= link_to({ after_scheduled_at: (@filter.last.scheduled_at || @filter.last.created_at), after_id: @filter.last.id }, class: "page-link") do %>
@@ -16,6 +16,4 @@
       </li>
     </ul>
   </nav>
-<% else %>
-  <em>No executions present.</em>
 <% end %>

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

@@ -1,4 +1,4 @@
-<div class="card my-3">
+<div class="card my-3" data-gj-poll-replace id="jobs-table">
   <div class="table-responsive">
     <table class="table card-table table-bordered table-hover table-sm mb-0">
       <thead>
@@ -21,45 +21,49 @@
         </tr>
       </thead>
       <tbody>
-        <% jobs.each do |job| %>
-          <tr class="<%= dom_class(job) %>" id="<%= dom_id(job) %>">
-            <td>
-              <%= link_to job_path(job.id) do %>
-                <code><%= job.id %></code>
-              <% end %>
-            </td>
-            <td>
-              <span class="badge bg-secondary"><%= job.status %></span>
-            </td>
-            <td><%= job.job_class %></td>
-            <td><%= job.queue_name %></td>
-            <td><%= relative_time(job.scheduled_at || job.created_at) %></td>
-            <td><%= job.executions_count %></td>
-            <td class="text-break"><%= truncate(job.recent_error, length: 1_000) %></td>
-            <td>
-              <%= tag.button "Preview", type: "button", class: "btn btn-sm btn-outline-primary", role: "button",
-                data: { bs_toggle: "collapse", bs_target: "##{dom_id(job, 'params')}" },
-                aria: { expanded: false, controls: dom_id(job, "params") }
-              %>
-              <%= tag.pre JSON.pretty_generate(job.serialized_params), id: dom_id(job, "params"), class: "collapse job-params" %>
-            </td>
-            <td>
-              <div class="text-nowrap">
-                <% job_reschedulable = job.status.in? [:scheduled, :retried, :queued] %>
-                <%= button_to reschedule_job_path(job.id), method: :put, class: "btn btn-sm #{job_reschedulable ? 'btn-outline-primary' : 'btn-outline-secondary'}", form_class: "d-inline-block", disabled: !job_reschedulable, aria: { label: "Reschedule job" }, title: "Reschedule job", data: { confirm: "Confirm reschedule" } do %>
-                  <%= render "good_job/shared/icons/skip_forward" %>
+        <% if jobs.present? %>
+          <% jobs.each do |job| %>
+            <tr class="<%= dom_class(job) %>" id="<%= dom_id(job) %>">
+              <td>
+                <%= link_to job_path(job.id) do %>
+                  <code><%= job.id %></code>
                 <% end %>
+              </td>
+              <td><%= status_badge(job.status) %></td>
+              <td><%= job.job_class %></td>
+              <td><%= job.queue_name %></td>
+              <td><%= relative_time(job.scheduled_at || job.created_at) %></td>
+              <td><%= job.executions_count %></td>
+              <td class="text-break"><%= truncate(job.recent_error, length: 1_000) %></td>
+              <td>
+                <%= tag.button "Preview", type: "button", class: "btn btn-sm btn-outline-primary", role: "button",
+                  data: { bs_toggle: "collapse", bs_target: "##{dom_id(job, 'params')}" },
+                  aria: { expanded: false, controls: dom_id(job, "params") }
+                %>
+                <%= tag.pre JSON.pretty_generate(job.serialized_params), id: dom_id(job, "params"), class: "collapse job-params" %>
+              </td>
+              <td>
+                <div class="text-nowrap">
+                  <% job_reschedulable = job.status.in? [:scheduled, :retried, :queued] %>
+                  <%= button_to reschedule_job_path(job.id), method: :put, class: "btn btn-sm #{job_reschedulable ? 'btn-outline-primary' : 'btn-outline-secondary'}", form_class: "d-inline-block", disabled: !job_reschedulable, aria: { label: "Reschedule job" }, title: "Reschedule job", data: { confirm: "Confirm reschedule" } do %>
+                    <%= render "good_job/shared/icons/skip_forward" %>
+                  <% end %>
 
-                <% job_discardable = job.status.in? [:scheduled, :retried, :queued] %>
-                <%= button_to discard_job_path(job.id), method: :put, class: "btn btn-sm #{job_discardable ? 'btn-outline-primary' : 'btn-outline-secondary'}", form_class: "d-inline-block", disabled: !job_discardable, aria: { label: "Discard job" }, title: "Discard job", data: { confirm: "Confirm discard" } do %>
-                  <%= render "good_job/shared/icons/stop" %>
-                <% end %>
+                  <% job_discardable = job.status.in? [:scheduled, :retried, :queued] %>
+                  <%= button_to discard_job_path(job.id), method: :put, class: "btn btn-sm #{job_discardable ? 'btn-outline-primary' : 'btn-outline-secondary'}", form_class: "d-inline-block", disabled: !job_discardable, aria: { label: "Discard job" }, title: "Discard job", data: { confirm: "Confirm discard" } do %>
+                    <%= render "good_job/shared/icons/stop" %>
+                  <% end %>
 
-                <%= button_to retry_job_path(job.id), method: :put, class: "btn btn-sm #{job.status == :discarded ? 'btn-outline-primary' : 'btn-outline-secondary'}", form_class: "d-inline-block", disabled: job.status != :discarded, aria: { label: "Retry job" }, title: "Retry job", data: { confirm: "Confirm retry" } do %>
-                  <%= render "good_job/shared/icons/arrow_clockwise" %>
-                <% end %>
-              </div>
-            </td>
+                  <%= button_to retry_job_path(job.id), method: :put, class: "btn btn-sm #{job.status == :discarded ? 'btn-outline-primary' : 'btn-outline-secondary'}", form_class: "d-inline-block", disabled: job.status != :discarded, aria: { label: "Retry job" }, title: "Retry job", data: { confirm: "Confirm retry" } do %>
+                    <%= render "good_job/shared/icons/arrow_clockwise" %>
+                  <% end %>
+                </div>
+              </td>
+            </tr>
+          <% end %>
+        <% else %>
+          <tr>
+            <td colspan="8" class="py-2 text-center text-muted">No jobs found.</td>
           </tr>
         <% end %>
       </tbody>

data/engine/app/views/good_job/jobs/index.html.erb

@@ -1,12 +1,17 @@
-<div class="card my-3 p-6">
+<div class="my-3 flex">
+  <h2>All Jobs</h2>
+</div>
+
+<div class="card my-3 p-6" data-gj-poll-replace id="jobs-chart">
   <%= render 'good_job/shared/chart', chart_data: GoodJob::ScheduledByQueueChart.new(@filter).data %>
 </div>
 
 <%= render 'good_job/shared/filter', filter: @filter %>
 
+<%= render 'good_job/jobs/table', jobs: @filter.records %>
+
 <% if @filter.records.present? %>
-  <%= render 'good_job/jobs/table', jobs: @filter.records %>
-  <nav aria-label="Job pagination" class="mt-3">
+  <nav aria-label="Job pagination" class="mt-3" data-gj-poll-replace id="jobs-pagination">
     <ul class="pagination">
       <li class="page-item">
         <%= link_to(@filter.to_params(after_scheduled_at: (@filter.last.scheduled_at || @filter.last.created_at), after_id: @filter.last.id), class: "page-link") do %>
@@ -15,6 +20,4 @@
       </li>
     </ul>
   </nav>
-<% else %>
-  <em>No jobs present.</em>
 <% end %>

data/engine/app/views/good_job/processes/index.html.erb

@@ -1,40 +1,46 @@
-<% if !GoodJob::Process.migrated? %>
-  <div class="card my-3">
-    <div class="card-body">
-      <p class="card-text">
-        <em>Feature unavailable because of pending database migration.</em>
-      </p>
+<div class="my-3 flex">
+  <h2>Processes</h2>
+</div>
+
+<div data-gj-poll-replace id="processes">
+  <% if !GoodJob::Process.migrated? %>
+    <div class="card my-3">
+      <div class="card-body">
+        <p class="card-text">
+          <em>Feature unavailable because of pending database migration.</em>
+        </p>
+      </div>
     </div>
-  </div>
-<% elsif @processes.present? %>
-  <div class="card my-3">
-    <div class="table-responsive">
-      <table class="table card-table table-bordered table-hover table-sm mb-0">
-        <thead>
-        <tr>
-          <th>Process UUID</th>
-          <th>Created At</th></th>
-          <th>State</th>
-        </tr>
-        </thead>
-        <tbody>
-        <% @processes.each do |process| %>
-          <tr class="<%= dom_class(process) %>" id="<%= dom_id(process) %>">
-            <td><%= process.id %></td>
-            <td><%= relative_time(process.created_at) %></td>
-            <td><%= tag.pre JSON.pretty_generate(process.state) %></td>
+  <% elsif @processes.present? %>
+    <div class="card my-3">
+      <div class="table-responsive">
+        <table class="table card-table table-bordered table-hover table-sm mb-0">
+          <thead>
+          <tr>
+            <th>Process UUID</th>
+            <th>Created At</th></th>
+            <th>State</th>
           </tr>
-        <% end %>
-        </tbody>
-      </table>
+          </thead>
+          <tbody>
+          <% @processes.each do |process| %>
+            <tr class="<%= dom_class(process) %>" id="<%= dom_id(process) %>">
+              <td><%= process.id %></td>
+              <td><%= relative_time(process.created_at) %></td>
+              <td><%= tag.pre JSON.pretty_generate(process.state) %></td>
+            </tr>
+          <% end %>
+          </tbody>
+        </table>
+      </div>
     </div>
-  </div>
-<% else %>
-  <div class="card my-3">
-    <div class="card-body">
-      <p class="card-text">
-        <em>No GoodJob processes found.</em>
-      </p>
+  <% else %>
+    <div class="card my-3">
+      <div class="card-body">
+        <p class="card-text">
+          <em>No GoodJob processes found.</em>
+        </p>
+      </div>
     </div>
-  </div>
-<% end %>
+  <% end %>
+</div>

data/engine/app/views/good_job/shared/_chart.erb

@@ -1,25 +1,3 @@
 <div class="chart-wrapper">
-  <canvas id="chart"></canvas>
+  <canvas class="chart" data-json="<%= chart_data.to_json %>"></canvas>
 </div>
-
-<%= javascript_tag nonce: true do %>
-  const chartData = <%== chart_data.to_json %>;
-
-  const ctx = document.getElementById('chart').getContext('2d');
-  const chart = new Chart(ctx, {
-    type: 'line',
-    data: {
-      labels: chartData.labels,
-      datasets: chartData.datasets
-    },
-    options: {
-      responsive: true,
-      maintainAspectRatio: false,
-      scales: {
-        y: {
-          beginAtZero: true
-        }
-      }
-    }
-  });
-<% end %>

data/engine/app/views/good_job/shared/_filter.erb

@@ -1,66 +1,59 @@
-<div class='card mb-2'>
-  <div class='card-body d-flex flex-wrap'>
-    <div class='mb-2 me-4'>
-      <small>Filter by job class</small>
-      <br>
-      <% filter.job_classes.each do |name, count| %>
-        <% if params[:job_class] == name %>
-          <%= link_to(filter.to_params(job_class: nil), class: 'btn btn-sm btn-outline-secondary active', role: "button", "aria-pressed": true)  do %>
-            <%= name %> (<%= count %>)
-          <% end %>
-        <% else %>
-          <%= link_to(filter.to_params(job_class: name), class: 'btn btn-sm btn-outline-secondary', role: "button") do %>
-            <%= name %> (<%= count %>)
-          <% end %>
+<%= form_with(url: "", method: :get, local: true, id: "filter_form") do |form| %>
+  <%= hidden_field_tag :poll, value: params[:poll] %>
+  <div class="d-flex flex-row w-100">
+    <div class="me-2">
+      <label for="job_class_filter">Job class</label>
+      <select name="job_class" id="job_class_filter" class="form-select">
+        <option value="" <%= "selected='selected'" if params[:job_class].blank? %>>All jobs</option>
+
+        <% filter.job_classes.each do |name, count| %>
+          <option value="<%= name.to_param %>" <%= "selected='selected'" if params[:job_class] == name %>><%= name %> (<%= count %>)</option>
         <% end %>
-      <% end %>
+      </select>
     </div>
 
-    <div class='mb-2 me-4'>
-      <small>Filter by state</small>
-      <br>
-      <% filter.states.each do |name, count| %>
-        <% if params[:state] == name %>
-          <%= link_to(filter.to_params(state: nil), class: 'btn btn-sm btn-outline-secondary active', role: "button", "aria-pressed": true)  do %>
-            <%= name %> (<%= count %>)
-          <% end %>
-        <% else %>
-          <%= link_to(filter.to_params(state: name), class: 'btn btn-sm btn-outline-secondary', role: "button") do %>
-            <%= name %> (<%= count %>)
-          <% end %>
+    <div class="me-2">
+      <label for="job_state_filter">State</label>
+      <select name="state" id="job_state_filter" class="form-select">
+        <option value="" <%= "selected='selected'" if params[:state].blank? %>>All states</option>
+
+        <% filter.states.each do |name, count| %>
+          <option value="<%= name.to_param %>" <%= "selected='selected'" if params[:state] == name %>><%= name %> (<%= count %>)</option>
         <% end %>
-      <% end %>
+      </select>
     </div>
 
-    <div class='mb-2 me-4'>
-      <small>Filter by queue</small>
-      <br>
-      <% filter.queues.each do |name, count| %>
-        <% if params[:queue_name] == name %>
-          <%= link_to(filter.to_params(queue_name: nil), class: 'btn btn-sm btn-outline-secondary active', role: "button", "aria-pressed": true)  do %>
-            <%= name %> (<%= count %>)
-          <% end %>
-        <% else %>
-          <%= link_to(filter.to_params(queue_name: name), class: 'btn btn-sm btn-outline-secondary', role: "button") do %>
-            <%= name %> (<%= count %>)
-          <% end %>
+    <div class="me-2">
+      <label for="job_queue_filter">Queue</label>
+      <select name="queue_name" id="job_queue_filter" class="form-select">
+        <option value="" <%= "selected='selected'" if params[:queue_name].blank? %>>All queues</option>
+
+        <% filter.queues.each do |name, count| %>
+          <option value="<%= name.to_param %>" <%= "selected='selected'" if params[:queue_name] == name %>><%= name %> (<%= count %>)</option>
         <% end %>
-      <% end %>
+      </select>
     </div>
 
-    <div class="mb-2">
-      <%= form_with(url: "", method: :get, local: true) do |form| %>
-        <% filter.to_params(query: nil).each do |key, value| %>
-          <%= form.hidden_field(key.to_sym, value: value) %>
-        <% end %>
+    <div class="me-2 flex-fill d-flex flex-col align-items-end">
+      <label class="visually-hidden" for="query" aria-label="Search by class, job id, job params, and error text.">Search by class, job id, job params, and error text.</label>
+      <%= search_field_tag "query", params[:query], class: "form-control", placeholder: "Search by class, job id, job params, and error text." %>
+    </div>
 
-        <small><%= form.label :query, "Search" %></small>
-        <div class="input-group input-group-sm">
-          <%= form.search_field :query, value: params[:query], class: "form-control" %>
-          <%= form.button "Search", type: "submit", name: nil, class: "btn btn-sm btn-outline-secondary" %>
-          <%= link_to "Clear", filter.to_params(query: nil), class: "btn btn-sm btn-outline-secondary" %>
-        </div>
-      <% end %>
+    <div class="d-flex flex-col align-items-end">
+      <div>
+        <%= form.submit "Search", name: nil, class: "btn btn-primary" %>
+        <%= link_to "Clear all", filter.to_params(job_class: nil, state: nil, queue_name: nil, query: nil), class: "btn btn-secondary" %>
+      </div>
     </div>
   </div>
-</div>
+<% end %>
+
+<%= javascript_tag nonce: true do %>
+  document.addEventListener("DOMContentLoaded", () => {
+    document.querySelectorAll("#job_class_filter, #job_state_filter, #job_queue_filter").forEach((filter) => {
+      filter.addEventListener("change", () => {
+        document.querySelector("#filter_form").submit();
+      });
+    })
+  })
+<% end %>

data/engine/app/views/layouts/good_job/base.html.erb

@@ -45,7 +45,10 @@
             </div>
           </li>
         </ul>
-        <div class="text-muted" title="Now is <%= Time.current %>">Times are displayed in <%= Time.current.zone %> timezone</div>
+        <div>
+          <input type="checkbox" id="toggle-poll" name="toggle-poll" data-gj-action='change#togglePoll' <%= 'checked' if params[:poll].present? %>>
+          <label for="toggle-poll">Live Poll</label>
+        </div>
       </div>
     </div>
   </nav>
@@ -70,7 +73,24 @@
         <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
       </div>
     <% end %>
+
     <%= yield %>
   </div>
+
+  <footer class="footer mt-auto py-3 bg-light fixed-bottom" id="footer" data-gj-poll-replace>
+    <div class="container-fluid">
+      <div class="row">
+        <div class="col-6">
+          <span class="text-muted">
+            Last updated: <time id="page-updated-at" datetime="<%= Time.current.utc.iso8601 %>"><%= Time.current %></time>
+          </span>
+        </div>
+
+        <div class="col-6 text-end">
+          Remember, you're doing a Good Job too!
+        </div>
+      </div>
+    </div>
+  </footer>
 </body>
 </html>

data/lib/good_job/active_job_extensions/concurrency.rb

@@ -62,7 +62,7 @@ module GoodJob
           next if key.blank?
 
           GoodJob::Execution.advisory_lock_key(key, function: "pg_advisory_lock") do
-            allowed_active_job_ids = GoodJob::Execution.where(concurrency_key: key).advisory_locked.order(Arel.sql("COALESCE(performed_at, scheduled_at, created_at) ASC")).limit(perform_limit).pluck(:active_job_id)
+            allowed_active_job_ids = GoodJob::Execution.unfinished.where(concurrency_key: key).advisory_locked.order(Arel.sql("COALESCE(performed_at, scheduled_at, created_at) ASC")).limit(perform_limit).pluck(:active_job_id)
             # The current job has already been locked and will appear in the previous query
             raise GoodJob::ActiveJobExtensions::Concurrency::ConcurrencyExceededError unless allowed_active_job_ids.include? job.job_id
           end

data/lib/good_job/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 2.9.5
+  version: 2.11.0
 platform: ruby
 authors:
 - Ben Sheldon
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -448,7 +448,7 @@ metadata:
   homepage_uri: https://github.com/bensheldon/good_job
   source_code_uri: https://github.com/bensheldon/good_job
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - GoodJob - a multithreaded, Postgres-based ActiveJob backend for Ruby on Rails
@@ -471,8 +471,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: A multithreaded, Postgres-based ActiveJob backend for Ruby on Rails
 test_files: []