good_job 2.9.3 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 815933ed8a435e9826bbb655e92c298d10d5bd74eb4f0474cb25d49a194d5cae
-  data.tar.gz: 29f7753f2401599feb16fc4b25e9c7073855f1fa135d88e640051533c2c24593
+  metadata.gz: 6b22cbc6d37af9dd8db290a1dc8073d2cae14c63e5cf7180b06dce1a33fb9992
+  data.tar.gz: 8cd87b2d69afea84db87125bad625558783adea98fee138be852e6a51c43dc50
 SHA512:
-  metadata.gz: 7dbf7489f53095634bb91e2a7e7fd8bb1a009ba3d81fb98312c7b8ae8f0516bc786e13b1100fdef1dd113e80c59b3d8433663ea4773d04ee517927f1bce1b560
-  data.tar.gz: b01d4ca76bb300dd4f755db2eb43758dd8146fe4e4ab1061d47cc973fe8e559b936df004054ed9ed92c9aefc6abee8f7db0ab33bf1ca812b57a9d7c192771077
+  metadata.gz: 230b335c5b6a03397c3212cd2bc59d87b2c735073233d068cf2c3045933b2aace533b0699a6fa1ecd41d77890af5aa18e1685b2c85f4c97c868773a3211736b7
+  data.tar.gz: b3fb4cb11f129fa8576e36c4e7401cdab927cf309bda963c3b82480dbe92663847b46a8e641b123e5ad7b28c53aa361d5fb6968131e23e85b0302768cc38e5d0

data/CHANGELOG.md

@@ -1,17 +1,84 @@
 # Changelog
 
-## [v2.9.3](https://github.com/bensheldon/good_job/tree/v2.9.3) (2022-01-23)
+## [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.2...v2.9.3)
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v2.9.6...v2.10.0)
 
 **Closed issues:**
 
-- Assets not loaded when Rails is configured with a different hostname for assets [\#491](https://github.com/bensheldon/good_job/issues/491)
+- 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)
+
+**Fixed bugs:**
+
+- Transactions in "aborting" threads do not commit; causes GoodJob::Process record not destroyed on exit [\#489](https://github.com/bensheldon/good_job/issues/489)
+- Deserialize ActiveJob arguments when manually retrying a job [\#513](https://github.com/bensheldon/good_job/pull/513) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- Concurrency key proc is missing `arguments` when retrying a discarded job. [\#512](https://github.com/bensheldon/good_job/issues/512)
+- Cron Schedule not visible in dashboard [\#496](https://github.com/bensheldon/good_job/issues/496)
+
+**Merged pull requests:**
+
+- Rename methods to `advisory_lock_key` and allow it to take a block instead of `with_advisory_lock` [\#511](https://github.com/bensheldon/good_job/pull/511) ([bensheldon](https://github.com/bensheldon))
+- README: Limiting concurrency - fetch symbol instead of string [\#510](https://github.com/bensheldon/good_job/pull/510) ([BenSto](https://github.com/BenSto))
+- Add arbitrary lock on class level too [\#499](https://github.com/bensheldon/good_job/pull/499) ([pandwoter](https://github.com/pandwoter))
+
+## [v2.9.4](https://github.com/bensheldon/good_job/tree/v2.9.4) (2022-01-31)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v2.9.3...v2.9.4)
+
+**Fixed bugs:**
+
+- Fix navbar toggler [\#506](https://github.com/bensheldon/good_job/pull/506) ([JuanVqz](https://github.com/JuanVqz))
+- Guard LogSubscriber against tagged logger without a formatter [\#504](https://github.com/bensheldon/good_job/pull/504) ([bensheldon](https://github.com/bensheldon))
+- Markdown lint fixes + Added missing responsive meta tag  [\#492](https://github.com/bensheldon/good_job/pull/492) ([zeevy](https://github.com/zeevy))
+
+**Closed issues:**
+
+- The navbar icon doesn't show the navbar menu when clicking it [\#503](https://github.com/bensheldon/good_job/issues/503)
+- Not all loggers have a formatter [\#502](https://github.com/bensheldon/good_job/issues/502)
+- Error logs from failed jobs used all storage space [\#495](https://github.com/bensheldon/good_job/issues/495)
+
+**Merged pull requests:**
+
+- Update Code of Conduct to Contributor Covenant 2.1 [\#501](https://github.com/bensheldon/good_job/pull/501) ([bensheldon](https://github.com/bensheldon))
+- Test with Ruby 3.1 [\#498](https://github.com/bensheldon/good_job/pull/498) ([aried3r](https://github.com/aried3r))
+
+## [v2.9.3](https://github.com/bensheldon/good_job/tree/v2.9.3) (2022-01-23)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v2.9.2...v2.9.3)
+
+**Fixed bugs:**
+
 - Use `*_url` route helpers for Dashboard assets to avoid being overridden by `config.asset_host` [\#493](https://github.com/bensheldon/good_job/pull/493) ([bensheldon](https://github.com/bensheldon))
 
+**Closed issues:**
+
+- Assets not loaded when Rails is configured with a different hostname for assets [\#491](https://github.com/bensheldon/good_job/issues/491)
+
 ## [v2.9.2](https://github.com/bensheldon/good_job/tree/v2.9.2) (2022-01-19)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v2.9.1...v2.9.2)

data/README.md

@@ -119,7 +119,7 @@ For more of the story of GoodJob, read the [introductory blog post](https://isla
     - By default, GoodJob separates job enqueuing from job execution so that jobs can be scaled independently of the web server.  Use the GoodJob command-line tool to execute jobs:
 
         ```bash
-        $ bundle exec good_job start
+        bundle exec good_job start
         ```
 
         Ideally the command-line tool should be run on a separate machine or container from the web process. For example, on Heroku:
@@ -133,8 +133,8 @@ For more of the story of GoodJob, read the [introductory blog post](https://isla
 
     - GoodJob can also be configured to execute jobs within the web server process to save on resources. This is useful for low-workloads when economy is paramount.
 
-        ```
-        $ GOOD_JOB_EXECUTION_MODE=async rails server
+        ```bash
+        GOOD_JOB_EXECUTION_MODE=async rails server
         ```
 
         Additional configuration is likely necessary, see the reference below for configuration.
@@ -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:
@@ -399,11 +399,9 @@ class MyJob < ApplicationJob
 
     # A unique key to be globally locked against.
     # Can be String or Lambda/Proc that is invoked in the context of the job.
-    # Note: Arguments passed to #perform_later must be accessed through `arguments` method.
-    key: -> { "Unique-#{arguments.first}" } #  MyJob.perform_later("Alice") => "Unique-Alice"
-
-    # If the method uses named parameters, they can be accessed like so:
-    # key: -> { "Unique-#{arguments.first['name']}" } #  MyJob.perform_later(name: "Alice")
+    # Note: Arguments passed to #perform_later can be accessed through ActiveJob's `arguments` method
+    # which is an array containing positional arguments and, optionally, a kwarg hash.
+    key: -> { "Unique-#{arguments.first}-#{arguments.last[:version]}" } #  MyJob.perform_later("Alice", version: 'v2') => "Unique-Alice-v2"
   )
 
   def perform(first_name)
@@ -470,7 +468,7 @@ To perform upgrades to the GoodJob database tables:
    Optional: If using Rails' multiple databases with the `migrations_paths` configuration option, use the `--database` option:
 
     ```bash
-    $ bin/rails g good_job:update --database animals
+    bin/rails g good_job:update --database animals
     ```
 
 1. Run the database migration locally
@@ -531,7 +529,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
@@ -703,7 +701,7 @@ GoodJob can execute jobs "async" in the same process as the web server (e.g. `bi
 - Or, with environment variables:
 
     ```bash
-    $ GOOD_JOB_EXECUTION_MODE=async GOOD_JOB_MAX_THREADS=4 GOOD_JOB_POLL_INTERVAL=30 bin/rails server
+    GOOD_JOB_EXECUTION_MODE=async GOOD_JOB_MAX_THREADS=4 GOOD_JOB_POLL_INTERVAL=30 bin/rails server
     ```
 
 Depending on your application configuration, you may need to take additional steps:
@@ -821,7 +819,7 @@ It is also necessary to delete these preserved jobs from the database after a ce
 - For example, using the `good_job` command-line utility:
 
     ```bash
-    $ bundle exec good_job cleanup_preserved_jobs --before-seconds-ago=86400
+    bundle exec good_job cleanup_preserved_jobs --before-seconds-ago=86400
     ```
 
 ### PgBouncer compatibility

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="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

@@ -4,9 +4,9 @@
 
 <%= 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 %>
 
+<% if @filter.records.present? %>
   <nav aria-label="Job pagination" class="mt-3">
     <ul class="pagination">
       <li class="page-item">
@@ -16,6 +16,4 @@
       </li>
     </ul>
   </nav>
-<% else %>
-  <em>No executions present.</em>
 <% end %>

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

@@ -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,11 +1,16 @@
+<div class="my-3 flex">
+  <h2>All Jobs</h2>
+</div>
+
 <div class="card my-3 p-6">
   <%= 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">
     <ul class="pagination">
       <li class="page-item">
@@ -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,3 +1,7 @@
+<div class="my-3 flex">
+  <h2>Processes</h2>
+</div>
+
 <% if !GoodJob::Process.migrated? %>
   <div class="card my-3">
     <div class="card-body">

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

@@ -1,66 +1,58 @@
-<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| %>
+  <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

@@ -2,6 +2,8 @@
 <html lang="en">
 <head>
   <title>Good Job Dashboard</title>
+  <meta charset="utf-8">
+  <meta content="width=device-width, initial-scale=1, shrink-to-fit=no" name="viewport">
   <%= csrf_meta_tags %>
   <%= csp_meta_tag %>
 
@@ -19,7 +21,7 @@
   <nav class="navbar navbar-expand-lg navbar-light bg-light">
     <div class="container-fluid">
       <%= link_to "GoodJob 👍", root_path, class: 'navbar-brand mb-0 h1' %>
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+      <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
       </button>
 

data/lib/good_job/active_job_extensions/concurrency.rb

@@ -30,7 +30,7 @@ module GoodJob
           key = job.good_job_concurrency_key
           next(block.call) if key.blank?
 
-          GoodJob::Execution.new.with_advisory_lock(key: key, function: "pg_advisory_lock") do
+          GoodJob::Execution.advisory_lock_key(key, function: "pg_advisory_lock") do
             enqueue_concurrency = if enqueue_limit
                                     GoodJob::Execution.where(concurrency_key: key).unfinished.advisory_unlocked.count
                                   else
@@ -61,8 +61,8 @@ module GoodJob
           key = job.good_job_concurrency_key
           next if key.blank?
 
-          GoodJob::Execution.new.with_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)
+          GoodJob::Execution.advisory_lock_key(key, function: "pg_advisory_lock") do
+            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/execution.rb

@@ -267,7 +267,9 @@ module GoodJob
     end
 
     def active_job
-      ActiveJob::Base.deserialize(active_job_data)
+      ActiveJob::Base.deserialize(active_job_data).tap do |aj|
+        aj.send(:deserialize_arguments_if_needed)
+      end
     end
 
     private

data/lib/good_job/lockable.rb

@@ -148,6 +148,7 @@ module GoodJob
         raise ArgumentError, "Must provide a block" unless block_given?
 
         records = advisory_lock(column: column, function: function).to_a
+
         begin
           unscoped { yield(records) }
         ensure
@@ -161,6 +162,53 @@ module GoodJob
         end
       end
 
+      # Acquires an advisory lock on this record if it is not already locked by
+      # another database session. Be careful to ensure you release the lock when
+      # you are done with {#advisory_unlock_key} to release all remaining locks.
+      # @param key [String, Symbol] Key to Advisory Lock against
+      # @param function [String, Symbol] Postgres Advisory Lock function name to use
+      # @return [Boolean] whether the lock was acquired.
+      def advisory_lock_key(key, function: advisory_lockable_function)
+        query = if function.include? "_try_"
+                  <<~SQL.squish
+                    SELECT #{function}(('x'||substr(md5($1::text), 1, 16))::bit(64)::bigint) AS locked
+                  SQL
+                else
+                  <<~SQL.squish
+                    SELECT #{function}(('x'||substr(md5($1::text), 1, 16))::bit(64)::bigint)::text AS locked
+                  SQL
+                end
+
+        binds = [
+          ActiveRecord::Relation::QueryAttribute.new('key', key, ActiveRecord::Type::String.new),
+        ]
+        locked = connection.exec_query(pg_or_jdbc_query(query), 'GoodJob::Lockable Advisory Lock', binds).first['locked']
+        return locked unless block_given?
+        return nil unless locked
+
+        begin
+          yield
+        ensure
+          advisory_unlock_key(key, function: advisory_unlockable_function(function))
+        end
+      end
+
+      # Releases an advisory lock on this record if it is locked by this database
+      # session. Note that advisory locks stack, so you must call
+      # {#advisory_unlock} and {#advisory_lock} the same number of times.
+      # @param key [String, Symbol] Key to lock against
+      # @param function [String, Symbol] Postgres Advisory Lock function name to use
+      # @return [Boolean] whether the lock was released.
+      def advisory_unlock_key(key, function: advisory_unlockable_function)
+        query = <<~SQL.squish
+          SELECT #{function}(('x'||substr(md5($1::text), 1, 16))::bit(64)::bigint) AS unlocked
+        SQL
+        binds = [
+          ActiveRecord::Relation::QueryAttribute.new('key', key, ActiveRecord::Type::String.new),
+        ]
+        connection.exec_query(pg_or_jdbc_query(query), 'GoodJob::Lockable Advisory Unlock', binds).first['unlocked']
+      end
+
       def _advisory_lockable_column
         advisory_lockable_column || primary_key
       end
@@ -205,20 +253,7 @@ module GoodJob
     # @param function [String, Symbol] Postgres Advisory Lock function name to use
     # @return [Boolean] whether the lock was acquired.
     def advisory_lock(key: lockable_key, function: advisory_lockable_function)
-      query = if function.include? "_try_"
-                <<~SQL.squish
-                  SELECT #{function}(('x'||substr(md5($1::text), 1, 16))::bit(64)::bigint) AS locked
-                SQL
-              else
-                <<~SQL.squish
-                  SELECT #{function}(('x'||substr(md5($1::text), 1, 16))::bit(64)::bigint)::text AS locked
-                SQL
-              end
-
-      binds = [
-        ActiveRecord::Relation::QueryAttribute.new('key', key, ActiveRecord::Type::String.new),
-      ]
-      self.class.connection.exec_query(pg_or_jdbc_query(query), 'GoodJob::Lockable Advisory Lock', binds).first['locked']
+      self.class.advisory_lock_key(key, function: function)
     end
 
     # Releases an advisory lock on this record if it is locked by this database
@@ -228,13 +263,7 @@ module GoodJob
     # @param function [String, Symbol] Postgres Advisory Lock function name to use
     # @return [Boolean] whether the lock was released.
     def advisory_unlock(key: lockable_key, function: self.class.advisory_unlockable_function(advisory_lockable_function))
-      query = <<~SQL.squish
-        SELECT #{function}(('x'||substr(md5($1::text), 1, 16))::bit(64)::bigint) AS unlocked
-      SQL
-      binds = [
-        ActiveRecord::Relation::QueryAttribute.new('key', key, ActiveRecord::Type::String.new),
-      ]
-      self.class.connection.exec_query(pg_or_jdbc_query(query), 'GoodJob::Lockable Advisory Unlock', binds).first['unlocked']
+      self.class.advisory_unlock_key(key, function: function)
     end
 
     # Acquires an advisory lock on this record or raises
@@ -245,8 +274,7 @@ module GoodJob
     # @raise [RecordAlreadyAdvisoryLockedError]
     # @return [Boolean] +true+
     def advisory_lock!(key: lockable_key, function: advisory_lockable_function)
-      result = advisory_lock(key: key, function: function)
-      result || raise(RecordAlreadyAdvisoryLockedError)
+      self.class.advisory_lock_key(key, function: function) || raise(RecordAlreadyAdvisoryLockedError)
     end
 
     # Acquires an advisory lock on this record and safely releases it after the
@@ -266,9 +294,11 @@ module GoodJob
       raise ArgumentError, "Must provide a block" unless block_given?
 
       advisory_lock!(key: key, function: function)
-      yield
-    ensure
-      advisory_unlock(key: key, function: self.class.advisory_unlockable_function(function)) unless $ERROR_INFO.is_a? RecordAlreadyAdvisoryLockedError
+      begin
+        yield
+      ensure
+        advisory_unlock(key: key, function: self.class.advisory_unlockable_function(function))
+      end
     end
 
     # Tests whether this record has an advisory lock on it.

data/lib/good_job/log_subscriber.rb

@@ -206,7 +206,7 @@ module GoodJob
       good_job_tag = ["ActiveJob"].freeze
 
       self.class.loggers.inject(block) do |inner, each_logger|
-        if each_logger.respond_to?(:tagged)
+        if each_logger.respond_to?(:tagged) && each_logger.formatter
           tags_for_logger = if each_logger.formatter.current_tags.include?("ActiveJob")
                               good_job_tag + tags
                             else

data/lib/good_job/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 2.9.3
+  version: 2.10.0
 platform: ruby
 authors:
 - Ben Sheldon
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-23 00:00:00.000000000 Z
+date: 2022-02-18 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: []