good_job 3.26.0 → 3.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a51ff44544ae7fb381fce50f13d3196d6a561bcdc6a5af7f37ad1e8fb0d6b258
-  data.tar.gz: 3703fe631d3f549bb152999203e5d67ac6d305c4ac77bba5b47621f3419cef21
+  metadata.gz: cd8ee28330829da54e9a3aa54e26b346c5a36749cadbe957871e800d7cd896fd
+  data.tar.gz: 42fd6406fafafff7a8635908db73c8a4159db1e86178551e1245d81c6485e943
 SHA512:
-  metadata.gz: ba6647af970ee04455977ccdfb835ac03648bc544ae3606e69e2007d04bf13634f0767c1263738d04101a6839949affd3227a19b1b573d27a6cb8bb4ea56a5b6
-  data.tar.gz: 3c8e79ae13f69d050f35aea95ebaf4c035a97138a89d24c57430776909d44c9fbbd9a5ab4460ca30efd65c2c16ec231780957c555f43a77dc100388dbfffb341
+  metadata.gz: 1b63f85473716cc66d12ff3886c3968606c0e6eff11d43b9ea49524419ba6f55841d3662660169712a5aca1b7715c9c50a9927626bc3416d495634864082effd
+  data.tar.gz: 83d2f99ca7aa3357af7625adbf05ab970b64fa9d6145d865ae045c737e7c8637e31b2da878e710db29feb2cf04a9dc63388663067bb096a6e2495e3d16b03367

data/CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## [v3.26.2](https://github.com/bensheldon/good_job/tree/v3.26.2) (2024-03-15)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.26.1...v3.26.2)
+
+**Closed issues:**
+
+- Async mode blocks ActionDispatch::Reloader [\#1274](https://github.com/bensheldon/good_job/issues/1274)
+
+**Merged pull requests:**
+
+- Update dependencies and their Sorbet / Tapioca files [\#1284](https://github.com/bensheldon/good_job/pull/1284) ([bensheldon](https://github.com/bensheldon))
+- Use require\_relative and do not modify $LOAD\_PATH in gemspec [\#1283](https://github.com/bensheldon/good_job/pull/1283) ([bensheldon](https://github.com/bensheldon))
+- Tweak rbtrace script [\#1279](https://github.com/bensheldon/good_job/pull/1279) ([bensheldon](https://github.com/bensheldon))
+- Fix for Rails head: Don't try to override connection on connection checkin in tests [\#1277](https://github.com/bensheldon/good_job/pull/1277) ([bensheldon](https://github.com/bensheldon))
+- Tiny improvements to french translation [\#1273](https://github.com/bensheldon/good_job/pull/1273) ([francois-ferrandis](https://github.com/francois-ferrandis))
+- Load metrics for top nav asynchronously [\#1231](https://github.com/bensheldon/good_job/pull/1231) ([binarygit](https://github.com/binarygit))
+
+## [v3.26.1](https://github.com/bensheldon/good_job/tree/v3.26.1) (2024-03-01)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.26.0...v3.26.1)
+
+**Fixed bugs:**
+
+- Ignore job deserialization errors when mass-retrying through the dashboard [\#1269](https://github.com/bensheldon/good_job/pull/1269) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- Plain HTTP 500 Error when retrying a job for deleted record [\#1263](https://github.com/bensheldon/good_job/issues/1263)
+
 ## [v3.26.0](https://github.com/bensheldon/good_job/tree/v3.26.0) (2024-03-01)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v3.25.0...v3.26.0)

data/app/controllers/good_job/jobs_controller.rb

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

data/app/controllers/good_job/metrics_controller.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module GoodJob
+  class MetricsController < ApplicationController
+    def primary_nav
+      jobs_count = GoodJob::Job.count
+      batches_count = GoodJob::BatchRecord.migrated? ? GoodJob::BatchRecord.all.size : 0
+      cron_entries_count = GoodJob::CronEntry.all.size
+      processes_count = GoodJob::Process.active.count
+
+      render json: {
+        jobs_count: number_to_human(jobs_count),
+        batches_count: number_to_human(batches_count),
+        cron_entries_count: number_to_human(cron_entries_count),
+        processes_count: number_to_human(processes_count),
+      }
+    end
+
+    private
+
+    def number_to_human(count)
+      helpers.number_to_human(count, **helpers.translate_hash("good_job.number.human.decimal_units"))
+    end
+  end
+end

data/app/frontend/good_job/application.js

@@ -9,8 +9,10 @@ import LivePoll from "live_poll";
 
 import { Application } from "stimulus";
 import ThemeController from "theme_controller";
+import AsyncValuesController from "async_values_controller";
 window.Stimulus = Application.start();
 Stimulus.register("theme", ThemeController)
+Stimulus.register("async-values", AsyncValuesController)
 
 documentReady(function() {
   renderCharts();

data/app/frontend/good_job/modules/async_values_controller.js

@@ -0,0 +1,31 @@
+import {Controller} from "stimulus"
+
+// Fetches JSON values from the server and updates the targets with the response.
+export default class extends Controller {
+  static values = {
+    url: String,
+  }
+  static targets = ["value"]
+
+  connect() {
+    this.#fetch();
+  }
+
+  async #fetch() {
+    const data = await fetch(this.urlValue).then(response => response.json())
+    this.valueTargets.forEach((target) => {
+      target.textContent = data[target.dataset['asyncValuesKey']];
+      target.classList.remove('d-none');
+
+      // When `data-async-values-zero-class="css-class"` is set, add `css-class` to the target if the value is "0"
+      if (target.dataset['asyncValuesZeroClass']) {
+        const className = target.dataset['asyncValuesZeroClass'];
+        if (data[target.dataset['asyncValuesKey']] === "0") {
+          target.classList.add(className);
+        } else {
+          target.classList.remove(className);
+        }
+      }
+    });
+  }
+}

data/app/models/good_job/base_execution.rb

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

data/app/models/good_job/job.rb

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

data/app/views/good_job/shared/_navbar.erb

@@ -14,33 +14,29 @@
     </button>
 
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
-      <ul class="navbar-nav me-auto">
+      <ul class="navbar-nav me-auto" data-controller="async-values" data-async-values-url-value="<%= metrics_primary_nav_path %>">
         <li class="nav-item">
           <%= link_to jobs_path, class: ["nav-link", ("active" if controller_name == 'jobs')] do %>
             <%= t(".jobs") %>
-            <% jobs_count = GoodJob::Job.count %>
-            <span class="badge bg-secondary rounded-pill"><%= number_to_human(jobs_count, **translate_hash("good_job.number.human.decimal_units")) %></span>
+            <span data-async-values-target="value" data-async-values-key="jobs_count" class="badge bg-secondary rounded-pill d-none"></span>
         <% end %>
         </li>
         <li class="nav-item">
           <%= link_to batches_path, class: ["nav-link", ("active" if controller_name == 'batches')] do %>
             <%=t ".batches" %>
-            <% batches_count = GoodJob::BatchRecord.migrated? ? GoodJob::BatchRecord.all.size : 0 %>
-            <span class="badge bg-secondary rounded-pill"><%= number_to_human(batches_count, **translate_hash("good_job.number.human.decimal_units")) %></span>
+            <span data-async-values-target="value" data-async-values-key="batches_count" class="badge bg-secondary rounded-pill  d-none"></span>
           <% end %>
         </li>
         <li class="nav-item">
           <%= link_to cron_entries_path, class: ["nav-link", ("active" if controller_name == 'cron_entries')] do %>
             <%= t(".cron_schedules") %>
-            <% cron_entries_count = GoodJob::CronEntry.all.size %>
-            <span class="badge bg-secondary rounded-pill"><%= cron_entries_count %></span>
+            <span data-async-values-target="value" data-async-values-key="cron_entries_count" class="badge bg-secondary rounded-pill d-none"></span>
         <% end %>
         </li>
         <li class="nav-item">
           <%= link_to processes_path, class: ["nav-link", ("active" if controller_name == 'processes')] do %>
             <%= t(".processes") %>
-            <% processes_count = GoodJob::Process.active.count %>
-            <span class="badge bg-secondary rounded-pill <%= "bg-danger" if processes_count == 0 %>"><%= processes_count %></span>
+            <span data-async-values-target="value" data-async-values-key="processes_count" data-async-values-zero-class="bg-danger" class="badge bg-secondary rounded-pill d-none"></span>
           <% end %>
         </li>
       </ul>

data/config/locales/fr.yml

@@ -214,11 +214,11 @@ fr:
         all: Tous
         all_jobs: Tous les jobs
         all_queues: Toutes les files d'attente
-        clear: Clair
+        clear: Réinitialiser
         job_name: Nom du job
         placeholder: Recherche par classe, ID de job, paramètres de job et texte d'erreur.
         queue_name: Nom de la file d'attente
-        search: Recherche
+        search: Rechercher
       navbar:
         batches: Lots
         cron_schedules: Cron
@@ -232,12 +232,12 @@ fr:
           light: Lumière
           theme: Thème
       secondary_navbar:
-        inspiration: N'oublie pas, toi aussi tu fais du bon boulot !
+        inspiration: N'oublie pas, toi aussi tu fais du bon boulot !
         last_updated: Dernière mise à jour
     status:
       discarded: Mis au rebut
       queued: À la file
       retried: Réessayés
       running: En cours
-      scheduled: Replanifiés
+      scheduled: Planifiés
       succeeded: Réussis

data/config/routes.rb

@@ -16,6 +16,7 @@ GoodJob::Engine.routes.draw do
       put :retry
     end
   end
+  get 'jobs/metrics/primary_nav', to: 'metrics#primary_nav', as: :metrics_primary_nav
 
   resources :batches, only: %i[index show]
 

data/lib/good_job/version.rb

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

data/lib/good_job.rb

@@ -3,44 +3,44 @@
 require "active_job"
 require "active_job/queue_adapters"
 
-require "good_job/version"
-require "good_job/engine"
-
-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/labels"
-require "good_job/active_job_extensions/notify_options"
-
-require "good_job/overridable_connection"
-require "good_job/bulk"
-require "good_job/callable"
-require "good_job/capsule"
-require "good_job/cleanup_tracker"
-require "good_job/cli"
-require "good_job/configuration"
-require "good_job/cron_manager"
-require "good_job/current_thread"
-require "good_job/daemon"
-require "good_job/dependencies"
-require "good_job/job_performer"
-require "good_job/job_performer/metrics"
-require "good_job/log_subscriber"
-require "good_job/multi_scheduler"
-require "good_job/notifier"
-require "good_job/poller"
-require "good_job/probe_server"
-require "good_job/probe_server/healthcheck_middleware"
-require "good_job/probe_server/not_found_app"
-require "good_job/probe_server/simple_handler"
-require "good_job/probe_server/webrick_handler"
-require "good_job/scheduler"
-require "good_job/shared_executor"
-require "good_job/systemd_service"
-require "good_job/thread_status"
+require_relative "good_job/version"
+require_relative "good_job/engine"
+
+require_relative "good_job/adapter"
+require_relative "active_job/queue_adapters/good_job_adapter"
+require_relative "good_job/active_job_extensions/batches"
+require_relative "good_job/active_job_extensions/concurrency"
+require_relative "good_job/interrupt_error"
+require_relative "good_job/active_job_extensions/interrupt_errors"
+require_relative "good_job/active_job_extensions/labels"
+require_relative "good_job/active_job_extensions/notify_options"
+
+require_relative "good_job/overridable_connection"
+require_relative "good_job/bulk"
+require_relative "good_job/callable"
+require_relative "good_job/capsule"
+require_relative "good_job/cleanup_tracker"
+require_relative "good_job/cli"
+require_relative "good_job/configuration"
+require_relative "good_job/cron_manager"
+require_relative "good_job/current_thread"
+require_relative "good_job/daemon"
+require_relative "good_job/dependencies"
+require_relative "good_job/job_performer"
+require_relative "good_job/job_performer/metrics"
+require_relative "good_job/log_subscriber"
+require_relative "good_job/multi_scheduler"
+require_relative "good_job/notifier"
+require_relative "good_job/poller"
+require_relative "good_job/probe_server"
+require_relative "good_job/probe_server/healthcheck_middleware"
+require_relative "good_job/probe_server/not_found_app"
+require_relative "good_job/probe_server/simple_handler"
+require_relative "good_job/probe_server/webrick_handler"
+require_relative "good_job/scheduler"
+require_relative "good_job/shared_executor"
+require_relative "good_job/systemd_service"
+require_relative "good_job/thread_status"
 
 # GoodJob is a multithreaded, Postgres-based, ActiveJob backend for Ruby on Rails.
 #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 3.26.0
+  version: 3.26.2
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-01 00:00:00.000000000 Z
+date: 2024-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -168,16 +168,16 @@ dependencies:
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -268,11 +268,13 @@ files:
 - app/controllers/good_job/cron_entries_controller.rb
 - app/controllers/good_job/frontends_controller.rb
 - app/controllers/good_job/jobs_controller.rb
+- app/controllers/good_job/metrics_controller.rb
 - app/controllers/good_job/processes_controller.rb
 - app/filters/good_job/base_filter.rb
 - app/filters/good_job/batches_filter.rb
 - app/filters/good_job/jobs_filter.rb
 - app/frontend/good_job/application.js
+- app/frontend/good_job/modules/async_values_controller.js
 - app/frontend/good_job/modules/charts.js
 - app/frontend/good_job/modules/checkbox_toggle.js
 - app/frontend/good_job/modules/document_ready.js