good_job 4.4.2 → 4.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7a4560e3e97c78d26ea5045bbd6de6d378191a52873be4f213d886f80bdf29c
-  data.tar.gz: 98cc8a6958a69898966efe296339bfc22130c75d6700ad80934e60948f864861
+  metadata.gz: 6c4f55ae789dad6bc4920527bdb107d7bc4422cbaec192dfc036b01ada67c54c
+  data.tar.gz: 8757dec952a510559eae0f7bf1a3210128b72e21d6ed3d17763507b47c4628e8
 SHA512:
-  metadata.gz: 1e1479d596427c82a6ed2b683aa0e8e171e20ab52b3591b49e757efd54b9ad5651c6a10643a42e3838c1042c2d17d96070d30888ceabff19b809185009c93e88
-  data.tar.gz: '0784732d866e3954803d23758a320d68adcd6ad9da30413419c514ffa5ea68a40dd3652eabd3847b24563814b2a37a48e1b55f2d8358a940daacbc6353fe8171'
+  metadata.gz: da3bf2a776ffca2181d2d205250e015bc138bc23a95004a65c703631d195e1891bd9eafc86733017dbc10233fb1b978615dadac4cbcb384ce9823c28f7b5e36f
+  data.tar.gz: a32557214eb62cc0cecb1d17750e83f074de0aef958b771c4846ff7e543432a1e9d474d0f922a241880b21beb07f96e6397bf0445f12286f169d5891cd61496c

data/CHANGELOG.md

@@ -1,5 +1,57 @@
 # Changelog
 
+## [v4.5.1](https://github.com/bensheldon/good_job/tree/v4.5.1) (2024-11-29)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v4.5.0...v4.5.1)
+
+**Implemented enhancements:**
+
+- GoodJob.cleanup\_preserved\_jobs: add :include\_discarded option [\#1550](https://github.com/bensheldon/good_job/pull/1550) ([jonleighton](https://github.com/jonleighton))
+
+**Fixed bugs:**
+
+- Fix compatibility with `rails-head` when duplicated advisory lockable column [\#1553](https://github.com/bensheldon/good_job/pull/1553) ([Earlopain](https://github.com/Earlopain))
+
+**Closed issues:**
+
+- `PG::AmbiguousColumn` after upgrade to 4.5.0 [\#1551](https://github.com/bensheldon/good_job/issues/1551)
+
+**Merged pull requests:**
+
+- Remove usage of COALESCE from dashboard chart [\#1306](https://github.com/bensheldon/good_job/pull/1306) ([bananatron](https://github.com/bananatron))
+
+## [v4.5.0](https://github.com/bensheldon/good_job/tree/v4.5.0) (2024-11-22)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v4.4.2...v4.5.0)
+
+**Implemented enhancements:**
+
+- Add "Discard Cleaner" page to dashboard UI [\#1538](https://github.com/bensheldon/good_job/pull/1538) ([lucasfcunha](https://github.com/lucasfcunha))
+- Add Process memory usage and fix process state update  [\#1516](https://github.com/bensheldon/good_job/pull/1516) ([noma4i](https://github.com/noma4i))
+
+**Fixed bugs:**
+
+- Fix cron double-enqueue because delay close to 0.01 and possibly clock-drift [\#1543](https://github.com/bensheldon/good_job/pull/1543) ([ccouton](https://github.com/ccouton))
+- Fix badge color for running jobs [\#1525](https://github.com/bensheldon/good_job/pull/1525) ([Wittiest](https://github.com/Wittiest))
+
+**Closed issues:**
+
+- Can't load Dashboard [\#1532](https://github.com/bensheldon/good_job/issues/1532)
+- Should we clean up batches if discarded callback jobs exist? [\#1528](https://github.com/bensheldon/good_job/issues/1528)
+- Modify error color for Running tab when a job has 1 attempt [\#1518](https://github.com/bensheldon/good_job/issues/1518)
+- Silence development warning output [\#1509](https://github.com/bensheldon/good_job/issues/1509)
+- Proposal - A better way of managing errors through the GoodJob UI [\#1464](https://github.com/bensheldon/good_job/issues/1464)
+
+**Merged pull requests:**
+
+- Ignore some warnings with the `warning` gem [\#1545](https://github.com/bensheldon/good_job/pull/1545) ([Earlopain](https://github.com/Earlopain))
+- Remove unneeded include of pg\_locks in query when displaying jobs table [\#1541](https://github.com/bensheldon/good_job/pull/1541) ([jgrau](https://github.com/jgrau))
+- Update development environment to Rails 8 [\#1539](https://github.com/bensheldon/good_job/pull/1539) ([bensheldon](https://github.com/bensheldon))
+- Bump the bundler-dependencies group with 9 updates [\#1534](https://github.com/bensheldon/good_job/pull/1534) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump the bundler-lint group with 5 updates [\#1533](https://github.com/bensheldon/good_job/pull/1533) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump rexml from 3.3.8 to 3.3.9 [\#1530](https://github.com/bensheldon/good_job/pull/1530) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Deprecate GoodJob::Job\#recent\_error [\#1526](https://github.com/bensheldon/good_job/pull/1526) ([Wittiest](https://github.com/Wittiest))
+
 ## [v4.4.2](https://github.com/bensheldon/good_job/tree/v4.4.2) (2024-10-18)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v4.4.1...v4.4.2)

data/app/charts/good_job/performance_index_chart.rb

@@ -5,7 +5,7 @@ module GoodJob
     def data
       table_name = GoodJob::Execution.table_name
 
-      sum_query = Arel.sql(GoodJob::Job.pg_or_jdbc_query(<<~SQL.squish))
+      sum_query = <<~SQL.squish
         SELECT *
         FROM generate_series(
           date_trunc('hour', $1::timestamp),

data/app/charts/good_job/performance_show_chart.rb

@@ -21,7 +21,7 @@ module GoodJob
       table_name = GoodJob::Execution.table_name
 
       interval_entries = BUCKET_INTERVALS.map { "interval '#{_1}'" }.join(",")
-      sum_query = Arel.sql(GoodJob::Job.pg_or_jdbc_query(<<~SQL.squish))
+      sum_query = <<~SQL.squish
         SELECT
           WIDTH_BUCKET(duration, ARRAY[#{interval_entries}]) as bucket_index,
           COUNT(WIDTH_BUCKET(duration, ARRAY[#{interval_entries}])) AS count

data/app/charts/good_job/scheduled_by_queue_chart.rb

@@ -8,9 +8,7 @@ module GoodJob
     end
 
     def data
-      table_name = GoodJob::Job.table_name
-
-      count_query = Arel.sql(GoodJob::Job.pg_or_jdbc_query(<<~SQL.squish))
+      count_query = <<~SQL.squish
         SELECT *
         FROM generate_series(
           date_trunc('hour', $1::timestamp),
@@ -23,7 +21,7 @@ module GoodJob
               queue_name,
               count(*) AS count
             FROM (
-              #{@filter.filtered_query.except(:select, :order).select('queue_name', "COALESCE(#{table_name}.scheduled_at, #{table_name}.created_at)::timestamp AS scheduled_at").to_sql}
+              #{@filter.filtered_query.except(:select, :order).select(:queue_name, :scheduled_at).to_sql}
             ) sources
             GROUP BY date_trunc('hour', scheduled_at), queue_name
         ) sources ON sources.scheduled_at = timestamp

data/app/controllers/good_job/cleaner_controller.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module GoodJob
+  class CleanerController < ApplicationController
+    def index
+      @filter = JobsFilter.new(params)
+
+      @discarded_jobs_grouped_by_exception =
+        GoodJob::Job.discarded
+                    .select(<<-SQL.squish)
+                      SPLIT_PART(error, ': ', 1) AS exception_class,
+                      count(id) AS failed,
+                      COUNT(id) FILTER (WHERE "finished_at" > NOW() - INTERVAL '1 HOUR') AS last_1_hour,
+                      COUNT(id) FILTER (WHERE "finished_at" > NOW() - INTERVAL '3 HOURS') AS last_3_hours,
+                      COUNT(id) FILTER (WHERE "finished_at" > NOW() - INTERVAL '24 HOURS') AS last_24_hours,
+                      COUNT(id) FILTER (WHERE "finished_at" > NOW() - INTERVAL '3 DAYS') AS last_3_days,
+                      COUNT(id) FILTER (WHERE "finished_at" > NOW() - INTERVAL '7 DAYS') AS last_7_days
+                    SQL
+                    .order(:exception_class)
+                    .group(:exception_class)
+
+      @discarded_jobs_grouped_by_class =
+        GoodJob::Job.discarded
+                    .select(<<-SQL.squish)
+                      job_class,
+                      count(id) AS failed,
+                      COUNT(*) FILTER (WHERE "finished_at" > NOW() - INTERVAL '1 HOUR') AS last_1_hour,
+                      COUNT(*) FILTER (WHERE "finished_at" > NOW() - INTERVAL '3 HOURS') AS last_3_hours,
+                      COUNT(*) FILTER (WHERE "finished_at" > NOW() - INTERVAL '24 HOURS') AS last_24_hours,
+                      COUNT(*) FILTER (WHERE "finished_at" > NOW() - INTERVAL '3 DAYS') AS last_3_days,
+                      COUNT(*) FILTER (WHERE "finished_at" > NOW() - INTERVAL '7 DAYS') AS last_7_days
+                    SQL
+                    .order(:job_class)
+                    .group(:job_class)
+    end
+  end
+end

data/app/controllers/good_job/metrics_controller.rb

@@ -7,12 +7,14 @@ module GoodJob
       batches_count = GoodJob::BatchRecord.all.size
       cron_entries_count = GoodJob::CronEntry.all.size
       processes_count = GoodJob::Process.active.count
+      discarded_count = GoodJob::Job.discarded.count
 
       render json: {
         jobs_count: helpers.number_to_human(jobs_count),
         batches_count: helpers.number_to_human(batches_count),
         cron_entries_count: helpers.number_to_human(cron_entries_count),
         processes_count: helpers.number_to_human(processes_count),
+        discarded_count: helpers.number_to_human(discarded_count),
       }
     end
 

data/app/filters/good_job/base_filter.rb

@@ -54,6 +54,7 @@ module GoodJob
         query: params[:query],
         state: params[:state],
         cron_key: params[:cron_key],
+        finished_since: params[:finished_since],
       }.merge(override).delete_if { |_, v| v.blank? }
     end
 

data/app/filters/good_job/jobs_filter.rb

@@ -27,6 +27,7 @@ module GoodJob
       query = query.where(queue_name: filter_params[:queue_name]) if filter_params[:queue_name].present?
       query = query.search_text(filter_params[:query]) if filter_params[:query].present?
       query = query.where(cron_key: filter_params[:cron_key]) if filter_params[:cron_key].present?
+      query = query.where(finished_at: finished_since(filter_params[:finished_since])..) if filter_params[:finished_since].present?
 
       if filter_params[:state]
         case filter_params[:state]
@@ -39,7 +40,7 @@ module GoodJob
         when 'scheduled'
           query = query.scheduled
         when 'running'
-          query = query.running.select("#{GoodJob::Job.table_name}.*", 'pg_locks.locktype')
+          query = query.running
         when 'queued'
           query = query.queued
         end
@@ -55,11 +56,26 @@ module GoodJob
     private
 
     def query_for_records
-      filtered_query.includes_advisory_locks
+      filtered_query
     end
 
     def default_base_query
       GoodJob::Job.all
     end
+
+    def finished_since(finished_since)
+      case finished_since
+      when '1_hour_ago'
+        1.hour.ago
+      when '3_hours_ago'
+        3.hours.ago
+      when '24_hours_ago'
+        24.hours.ago
+      when '3_days_ago'
+        3.days.ago
+      when '7_days_ago'
+        7.days.ago
+      end
+    end
   end
 end

data/app/models/concerns/good_job/advisory_lockable.rb

@@ -41,8 +41,16 @@ module GoodJob
       scope :advisory_lock, (lambda do |column: _advisory_lockable_column, function: advisory_lockable_function, select_limit: nil|
         original_query = self
 
+        primary_key_for_select = primary_key.to_sym
+        column_for_select = column.to_sym
+
         cte_table = Arel::Table.new(:rows)
-        cte_query = original_query.select(primary_key, column).except(:limit)
+        cte_query = original_query.except(:limit)
+        cte_query = if primary_key_for_select == column_for_select
+                      cte_query.select(primary_key_for_select)
+                    else
+                      cte_query.select(primary_key_for_select, column_for_select)
+                    end
         cte_query = cte_query.limit(select_limit) if select_limit
         cte_type = supports_cte_materialization_specifiers? ? :MATERIALIZED : :""
         composed_cte = Arel::Nodes::As.new(cte_table, Arel::Nodes::UnaryOperation.new(cte_type, cte_query.arel))

data/app/models/good_job/job.rb

@@ -390,7 +390,12 @@ module GoodJob
     # If the job has been retried, the error will be fetched from the previous {Execution} record.
     # @return [String]
     def recent_error
-      error || executions[-2]&.error
+      GoodJob.deprecator.warn(<<~DEPRECATION)
+        The `GoodJob::Job#recent_error` method is deprecated and will be removed in the next major release.
+
+        Replace usage of GoodJob::Job#recent_error with `GoodJob::Job#error`.
+      DEPRECATION
+      error
     end
 
     # Errors for the job to be displayed in the Dashboard.

data/app/models/good_job/process.rb

@@ -12,6 +12,28 @@ module GoodJob # :nodoc:
     STALE_INTERVAL = 30.seconds
     # Interval until the process record is treated as expired
     EXPIRED_INTERVAL = 5.minutes
+    PROCESS_MEMORY = case RUBY_PLATFORM
+                     when /linux/
+                       lambda do |pid|
+                         File.readlines("/proc/#{pid}/smaps_rollup").each do |line|
+                           next unless line.start_with?('Pss:')
+
+                           break line.split[1].to_i
+                         end
+                       rescue Errno::ENOENT
+                         File.readlines("/proc/#{pid}/status").each do |line|
+                           next unless line.start_with?('VmRSS:')
+
+                           break line.split[1].to_i
+                         end
+                       end
+                     when /darwin|bsd/
+                       lambda do |pid|
+                         `ps -o pid,rss -p #{pid.to_i}`.lines.last.split.last.to_i
+                       end
+                     else
+                       ->(_pid) { 0 }
+                     end
 
     self.table_name = 'good_job_processes'
     self.implicit_order_column = 'created_at'
@@ -56,6 +78,13 @@ module GoodJob # :nodoc:
       end
     end
 
+    # @return [Integer]
+    def self.memory_usage(pid)
+      PROCESS_MEMORY.call(pid)
+    rescue StandardError
+      0
+    end
+
     def self.find_or_create_record(id:, with_advisory_lock: false)
       attributes = {
         id: id,
@@ -83,6 +112,7 @@ module GoodJob # :nodoc:
       {
         hostname: Socket.gethostname,
         pid: ::Process.pid,
+        memory: memory_usage(::Process.pid),
         proctitle: $PROGRAM_NAME,
         preserve_job_records: GoodJob.preserve_job_records,
         retry_on_unhandled_error: GoodJob.retry_on_unhandled_error,
@@ -98,8 +128,8 @@ module GoodJob # :nodoc:
     end
 
     def refresh
-      self.state = self.class.process_state
       reload # verify the record still exists in the database
+      self.state = self.class.process_state
       update(state: state, updated_at: Time.current)
     rescue ActiveRecord::RecordNotFound
       @new_record = true

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

@@ -35,17 +35,18 @@
               </div>
               <div class="col-4 col-lg-1 text-lg-end">
                 <div class="d-lg-none small text-muted mt-1"><%= t "good_job.models.job.attempts" %></div>
-                <% if job.executions_count > 0 && job.status != :finished %>
+                <% if job.error %>
                   <%= tag.span job.executions_count, class: "badge rounded-pill bg-danger",
                     data: {
                       bs_toggle: "popover",
                       bs_trigger: "hover focus click",
                       bs_placement: "bottom",
-                      bs_content: job.recent_error,
+                      bs_content: job.display_error,
                     }
                   %>
                 <% else %>
-                  <span class="badge bg-secondary rounded-pill"><%= job.executions_count %></span>
+                  <% executions_badge_color = job.executions_count > 1 ? "bg-warning" : "bg-secondary" %>
+                  <span class="badge rounded-pill <%= executions_badge_color %>"><%= job.executions_count %></span>
                 <% end %>
               </div>
               <div class="mt-3 mt-lg-0 col d-flex gap-3 align-items-center justify-content-end">
@@ -79,7 +80,7 @@
                       <% end %>
                     </li>
                     <li>
-                      <%= link_to job_path(job.id), method: :delete, class: "dropdown-item #{'disabled' unless job.status.in? [:discarded, :finished]}", title: t(".actions.destroy"), data: { confirm: t(".actions.confirm_destroy"), disable: true } do %>
+                      <%= link_to job_path(job.id), method: :delete, class: "dropdown-item #{'disabled' unless job.finished?}", title: t(".actions.destroy"), data: { confirm: t(".actions.confirm_destroy"), disable: true } do %>
                         <%= render_icon "trash" %>
                         <%= t "good_job.actions.destroy" %>
                       <% end %>

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

@@ -0,0 +1,85 @@
+<div class="border-bottom">
+  <h2 class="pt-3 pb-2"><%= t ".title" %></h2>
+</div>
+
+<div>
+  <h4 class="pt-3 pb-2"><%= t ".grouped_by_class" %></h4>
+  <table class="table align-middle" id="by-job-class">
+    <thead>
+      <tr>
+        <th scope="col" class="col-3"><%= t ".class" %></th>
+        <th scope="col" class="text-center"><%= t ".all" %></th>
+        <th scope="col" class="text-center"><%= t ".last_1_hour" %></th>
+        <th scope="col" class="text-center"><%= t ".last_3_hours" %></th>
+        <th scope="col" class="text-center"><%= t ".last_24_hours" %></th>
+        <th scope="col" class="text-center"><%= t ".last_3_days" %></th>
+        <th scope="col" class="text-center"><%= t ".last_7_days" %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @discarded_jobs_grouped_by_class.each do |discard_job| %>
+        <tr>
+          <td scope="row" class="col-3 text-break"><%= discard_job.job_class %></td>
+          <td class="text-center "><%= link_to discard_job.failed, jobs_path(@filter.to_params(job_class: discard_job.job_class, state: 'discarded')) %></td>
+          <td class="text-center"><%= link_to discard_job.last_1_hour, jobs_path(@filter.to_params(job_class: discard_job.job_class, state: 'discarded', finished_since: '1_hour_ago')) %></td>
+          <td class="text-center"><%= link_to discard_job.last_3_hours, jobs_path(@filter.to_params(job_class: discard_job.job_class, state: 'discarded', finished_since: '3_hours_ago')) %></td>
+          <td class="text-center"><%= link_to discard_job.last_24_hours, jobs_path(@filter.to_params(job_class: discard_job.job_class, state: 'discarded', finished_since: '24_hours_ago')) %></td>
+          <td class="text-center"><%= link_to discard_job.last_3_days, jobs_path(@filter.to_params(job_class: discard_job.job_class, state: 'discarded', finished_since: '3_days_ago')) %></td>
+          <td class="text-center"><%= link_to discard_job.last_7_days, jobs_path(@filter.to_params(job_class: discard_job.job_class, state: 'discarded', finished_since: '7_days_ago')) %></td>
+        </tr>
+      <% end %>
+    </tbody>
+    <tfoot>
+      <tr>
+        <td scope="row" class="col-3 fw-bold"><%= t ".total" %></td>
+        <td class="text-center fw-bold"><%= link_to @discarded_jobs_grouped_by_class.sum(&:failed), jobs_path(@filter.to_params(state: 'discarded')) %></td>
+        <td class="text-center fw-bold"><%= link_to @discarded_jobs_grouped_by_class.sum(&:last_1_hour), jobs_path(@filter.to_params(state: 'discarded', finished_since: '1_hour_ago')) %></td>
+        <td class="text-center fw-bold"><%= link_to @discarded_jobs_grouped_by_class.sum(&:last_3_hours), jobs_path(@filter.to_params(state: 'discarded', finished_since: '3_hours_ago')) %></td>
+        <td class="text-center fw-bold"><%= link_to @discarded_jobs_grouped_by_class.sum(&:last_24_hours), jobs_path(@filter.to_params(state: 'discarded', finished_since: '24_hours_ago')) %></td>
+        <td class="text-center fw-bold"><%= link_to @discarded_jobs_grouped_by_class.sum(&:last_3_days), jobs_path(@filter.to_params(state: 'discarded', finished_since: '3_days_ago')) %></td>
+        <td class="text-center fw-bold"><%= link_to @discarded_jobs_grouped_by_class.sum(&:last_7_days), jobs_path(@filter.to_params(state: 'discarded', finished_since: '7_days_ago')) %></td>
+      </tr>
+    </tfoot>
+  </table>
+</div>
+
+<div>
+  <h4 class="pt-3 pb-2"><%= t ".grouped_by_exception" %></h4>
+  <table class="table align-middle" id="by-exception">
+    <thead>
+      <tr>
+        <th scope="col" class="col-3"><%= t ".exception" %></th>
+        <th scope="col" class="text-center"><%= t ".all" %></th>
+        <th scope="col" class="text-center"><%= t ".last_1_hour" %></th>
+        <th scope="col" class="text-center"><%= t ".last_3_hours" %></th>
+        <th scope="col" class="text-center"><%= t ".last_24_hours" %></th>
+        <th scope="col" class="text-center"><%= t ".last_3_days" %></th>
+        <th scope="col" class="text-center"><%= t ".last_7_days" %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @discarded_jobs_grouped_by_exception.each do |discard_job| %>
+        <tr>
+          <td scope="row" class="col-3 text-break"><%= discard_job.exception_class %></td>
+          <td class="text-center"><%= link_to discard_job.failed, jobs_path(@filter.to_params(state: 'discarded', query: discard_job.exception_class)) %></td>
+          <td class="text-center"><%= link_to discard_job.last_1_hour, jobs_path(@filter.to_params(state: 'discarded', query: discard_job.exception_class, finished_since: '1_hour_ago')) %></td>
+          <td class="text-center"><%= link_to discard_job.last_3_hours, jobs_path(@filter.to_params(state: 'discarded', query: discard_job.exception_class, finished_since: '3_hours_ago')) %></td>
+          <td class="text-center"><%= link_to discard_job.last_24_hours, jobs_path(@filter.to_params(state: 'discarded', query: discard_job.exception_class, finished_since: '24_hours_ago')) %></td>
+          <td class="text-center"><%= link_to discard_job.last_3_days, jobs_path(@filter.to_params(state: 'discarded', query: discard_job.exception_class, finished_since: '3_days_ago')) %></td>
+          <td class="text-center"><%= link_to discard_job.last_7_days, jobs_path(@filter.to_params(state: 'discarded', query: discard_job.exception_class, finished_since: '7_days_ago')) %></td>
+        </tr>
+      <% end %>
+    </tbody>
+    <tfoot>
+      <tr>
+        <td scope="row" class="col-3 fw-bold"><%= t ".total" %></td>
+        <td class="text-center fw-bold"><%= link_to @discarded_jobs_grouped_by_exception.sum(&:failed), jobs_path(@filter.to_params(state: 'discarded')) %></td>
+        <td class="text-center fw-bold"><%= link_to @discarded_jobs_grouped_by_exception.sum(&:last_1_hour), jobs_path(@filter.to_params(state: 'discarded', finished_since: '1_hour_ago')) %></td>
+        <td class="text-center fw-bold"><%= link_to @discarded_jobs_grouped_by_exception.sum(&:last_3_hours), jobs_path(@filter.to_params(state: 'discarded', finished_since: '3_hours_ago')) %></td>
+        <td class="text-center fw-bold"><%= link_to @discarded_jobs_grouped_by_exception.sum(&:last_24_hours), jobs_path(@filter.to_params(state: 'discarded', finished_since: '24_hours_ago')) %></td>
+        <td class="text-center fw-bold"><%= link_to @discarded_jobs_grouped_by_exception.sum(&:last_3_days), jobs_path(@filter.to_params(state: 'discarded', finished_since: '3_days_ago')) %></td>
+        <td class="text-center fw-bold"><%= link_to @discarded_jobs_grouped_by_exception.sum(&:last_7_days), jobs_path(@filter.to_params(state: 'discarded', finished_since: '7_days_ago')) %></td>
+      </tr>
+    </tfoot>
+  </table>
+</div>

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

@@ -84,7 +84,7 @@
               </div>
               <div class="col-4 col-lg-1 text-lg-end">
                 <div class="d-lg-none small text-muted mt-1"><%= t "good_job.models.job.attempts" %></div>
-                <% if job.executions_count > 0 && job.status != :succeeded %>
+                <% if job.error %>
                   <%= tag.span job.executions_count, class: "badge rounded-pill bg-danger",
                     data: {
                       bs_toggle: "popover",
@@ -94,7 +94,8 @@
                     }
                   %>
                 <% else %>
-                  <span class="badge bg-secondary rounded-pill"><%= job.executions_count %></span>
+                  <% executions_badge_color = job.executions_count > 1 ? "bg-warning" : "bg-secondary" %>
+                  <span class="badge rounded-pill <%= executions_badge_color %>"><%= job.executions_count %></span>
                 <% end %>
               </div>
               <div class="mt-3 mt-lg-0 col">

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

@@ -38,6 +38,7 @@
               <span class="badge rounded-pill bg-body-secondary text-secondary"><%= process.state["pid"] %></span>
               <span class="text-muted small">@</span>
               <span class="badge rounded-pill bg-body-secondary text-secondary"><%= process.state["hostname"] %></span>
+              <span class="badge rounded-pill bg-body-secondary text-secondary"><%= (process.state["memory"] / 1024).to_i %> MB</span>
             </div>
           </div>
           <div class="col">

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

@@ -44,6 +44,12 @@
             <%= t(".performance") %>
           <% end %>
         </li>
+        <li class="nav-item">
+          <%= link_to cleaner_index_path, class: ["nav-link", ("active" if controller_name == 'cleaner')] do %>
+            <%= t(".cleaner") %>
+            <span data-async-values-target="value" data-async-values-key="discarded_count" class="badge bg-secondary rounded-pill d-none"></span>
+          <% end %>
+        </li>
       </ul>
 
       <ul class="navbar-nav">

data/config/brakeman.ignore

@@ -53,7 +53,7 @@
       "check_name": "SQL",
       "message": "Possible SQL injection",
       "file": "app/models/good_job/job.rb",
-      "line": 140,
+      "line": 135,
       "link": "https://brakemanscanner.org/docs/warning_types/sql_injection/",
       "code": "Arel.sql(\"(CASE #{queues.map.with_index do\n sanitize_sql_array([\"WHEN queue_name = ? THEN ?\", queue_name, index])\n end.join(\" \")} ELSE #{queues.size} END)\")",
       "render_path": null,
@@ -68,8 +68,31 @@
         89
       ],
       "note": "Developer provided value, queue_name, is sanitized."
+    },
+    {
+      "warning_type": "Command Injection",
+      "warning_code": 14,
+      "fingerprint": "dbb80167f57edebfd9da72e1278d425095a0329755e24d3c50e0fda6bb21c097",
+      "check_name": "Execute",
+      "message": "Possible command injection",
+      "file": "app/models/good_job/process.rb",
+      "line": 32,
+      "link": "https://brakemanscanner.org/docs/warning_types/command_injection/",
+      "code": "`ps -o pid,rss -p #{pid.to_i}`",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "Process",
+        "method": null
+      },
+      "user_input": "pid.to_i",
+      "confidence": "Medium",
+      "cwe_id": [
+        77
+      ],
+      "note": ""
     }
   ],
-  "updated": "2024-07-18 18:05:56 -0700",
-  "brakeman_version": "6.1.2"
+  "updated": "2024-11-16 17:00:20 -0600",
+  "brakeman_version": "6.2.1"
 }

data/config/locales/de.yml

@@ -35,6 +35,20 @@ de:
         callback_jobs: Callback-Jobs
       table:
         no_batches_found: Keine Batches gefunden.
+    cleaner:
+      index:
+        all: All
+        class: Class
+        exception: Exception
+        grouped_by_class: Discards grouped by Class
+        grouped_by_exception: Discards grouped by Exception
+        last_1_hour: Last 1 hour
+        last_24_hours: Last 24 hours
+        last_3_days: Last 3 days
+        last_3_hours: Last 3 hours
+        last_7_days: Last 7 days
+        title: Discard Cleaner
+        total: Total
     cron_entries:
       actions:
         confirm_disable: Bist du sicher, dass du diesen Cron-Eintrag deaktivieren willst?
@@ -236,6 +250,7 @@ de:
         search: Suchen
       navbar:
         batches: Batches
+        cleaner: Discard Cleaner
         cron_schedules: Cron
         jobs: Jobs
         live_poll: Live Poll

data/config/locales/en.yml

@@ -35,6 +35,20 @@ en:
         callback_jobs: Callback Jobs
       table:
         no_batches_found: No batches found.
+    cleaner:
+      index:
+        all: All
+        class: Class
+        exception: Exception
+        grouped_by_class: Discards grouped by Class
+        grouped_by_exception: Discards grouped by Exception
+        last_1_hour: Last 1 hour
+        last_24_hours: Last 24 hours
+        last_3_days: Last 3 days
+        last_3_hours: Last 3 hours
+        last_7_days: Last 7 days
+        title: Discard Cleaner
+        total: Total
     cron_entries:
       actions:
         confirm_disable: Are you sure you want to disable this cron entry?
@@ -236,6 +250,7 @@ en:
         search: Search
       navbar:
         batches: Batches
+        cleaner: Discard Cleaner
         cron_schedules: Cron
         jobs: Jobs
         live_poll: Live Poll

data/config/locales/es.yml

@@ -35,6 +35,20 @@ es:
         callback_jobs: Callback Jobs
       table:
         no_batches_found: No hay lotes.
+    cleaner:
+      index:
+        all: All
+        class: Class
+        exception: Exception
+        grouped_by_class: Discards grouped by Class
+        grouped_by_exception: Discards grouped by Exception
+        last_1_hour: Last 1 hour
+        last_24_hours: Last 24 hours
+        last_3_days: Last 3 days
+        last_3_hours: Last 3 hours
+        last_7_days: Last 7 days
+        title: Discard Cleaner
+        total: Total
     cron_entries:
       actions:
         confirm_disable: "¿Estás seguro que querés deshabilitar esta tarea programada?"
@@ -236,6 +250,7 @@ es:
         search: Buscar
       navbar:
         batches: Lotes
+        cleaner: Discard Cleaner
         cron_schedules: Cron
         jobs: Tareas
         live_poll: En vivo

data/config/locales/fr.yml

@@ -35,6 +35,20 @@ fr:
         callback_jobs: Jobs de rappel
       table:
         no_batches_found: Aucun lot trouvé.
+    cleaner:
+      index:
+        all: All
+        class: Class
+        exception: Exception
+        grouped_by_class: Discards grouped by Class
+        grouped_by_exception: Discards grouped by Exception
+        last_1_hour: Last 1 hour
+        last_24_hours: Last 24 hours
+        last_3_days: Last 3 days
+        last_3_hours: Last 3 hours
+        last_7_days: Last 7 days
+        title: Discard Cleaner
+        total: Total
     cron_entries:
       actions:
         confirm_disable: Voulez-vous vraiment désactiver cette entrée cron ?
@@ -236,6 +250,7 @@ fr:
         search: Rechercher
       navbar:
         batches: Lots
+        cleaner: Discard Cleaner
         cron_schedules: Cron
         jobs: Jobs
         live_poll: En direct

data/config/locales/it.yml

@@ -35,6 +35,20 @@ it:
         callback_jobs: Job di callback
       table:
         no_batches_found: Nessun batch trovato.
+    cleaner:
+      index:
+        all: All
+        class: Class
+        exception: Exception
+        grouped_by_class: Discards grouped by Class
+        grouped_by_exception: Discards grouped by Exception
+        last_1_hour: Last 1 hour
+        last_24_hours: Last 24 hours
+        last_3_days: Last 3 days
+        last_3_hours: Last 3 hours
+        last_7_days: Last 7 days
+        title: Discard Cleaner
+        total: Total
     cron_entries:
       actions:
         confirm_disable: Sei sicuro di voler disabilitare questa voce cron?
@@ -236,6 +250,7 @@ it:
         search: Cerca
       navbar:
         batches: Batch
+        cleaner: Discard Cleaner
         cron_schedules: Cron
         jobs: Job
         live_poll: Live Poll

data/config/locales/ja.yml

@@ -35,6 +35,20 @@ ja:
         callback_jobs: コールバックジョブ
       table:
         no_batches_found: バッチが見つかりませんでした。
+    cleaner:
+      index:
+        all: All
+        class: Class
+        exception: Exception
+        grouped_by_class: Discards grouped by Class
+        grouped_by_exception: Discards grouped by Exception
+        last_1_hour: Last 1 hour
+        last_24_hours: Last 24 hours
+        last_3_days: Last 3 days
+        last_3_hours: Last 3 hours
+        last_7_days: Last 7 days
+        title: Discard Cleaner
+        total: Total
     cron_entries:
       actions:
         confirm_disable: このcronエントリを無効化してもよろしいですか？
@@ -236,6 +250,7 @@ ja:
         search: 検索
       navbar:
         batches: バッチ
+        cleaner: Discard Cleaner
         cron_schedules: Cron
         jobs: ジョブ
         live_poll: リアルタイム更新

data/config/locales/ko.yml

@@ -35,6 +35,20 @@ ko:
         callback_jobs: 콜백 작업
       table:
         no_batches_found: 배치를 찾을 수 없습니다.
+    cleaner:
+      index:
+        all: All
+        class: Class
+        exception: Exception
+        grouped_by_class: Discards grouped by Class
+        grouped_by_exception: Discards grouped by Exception
+        last_1_hour: Last 1 hour
+        last_24_hours: Last 24 hours
+        last_3_days: Last 3 days
+        last_3_hours: Last 3 hours
+        last_7_days: Last 7 days
+        title: Discard Cleaner
+        total: Total
     cron_entries:
       actions:
         confirm_disable: 이 cron 엔트리를 비활성화하시겠습니까?
@@ -236,6 +250,7 @@ ko:
         search: 검색
       navbar:
         batches: 배치
+        cleaner: Discard Cleaner
         cron_schedules: Cron
         jobs: 작업
         live_poll: 실시간 업데이트

data/config/locales/nl.yml

@@ -35,6 +35,20 @@ nl:
         callback_jobs: Terugbelopdrachten
       table:
         no_batches_found: Geen batches gevonden.
+    cleaner:
+      index:
+        all: All
+        class: Class
+        exception: Exception
+        grouped_by_class: Discards grouped by Class
+        grouped_by_exception: Discards grouped by Exception
+        last_1_hour: Last 1 hour
+        last_24_hours: Last 24 hours
+        last_3_days: Last 3 days
+        last_3_hours: Last 3 hours
+        last_7_days: Last 7 days
+        title: Discard Cleaner
+        total: Total
     cron_entries:
       actions:
         confirm_disable: Weet u zekerf dat u deze cron-vermelding wilt uitschakelen?
@@ -236,6 +250,7 @@ nl:
         search: Zoekopdracht
       navbar:
         batches: Batches
+        cleaner: Discard Cleaner
         cron_schedules: Cron
         jobs: Taken
         live_poll: Live Poll

data/config/locales/pt-BR.yml

@@ -35,6 +35,20 @@ pt-BR:
         callback_jobs: Tarefas de Callback
       table:
         no_batches_found: Nenhum lote encontrado.
+    cleaner:
+      index:
+        all: All
+        class: Class
+        exception: Exception
+        grouped_by_class: Discards grouped by Class
+        grouped_by_exception: Discards grouped by Exception
+        last_1_hour: Last 1 hour
+        last_24_hours: Last 24 hours
+        last_3_days: Last 3 days
+        last_3_hours: Last 3 hours
+        last_7_days: Last 7 days
+        title: Discard Cleaner
+        total: Total
     cron_entries:
       actions:
         confirm_disable: Tem certeza de que deseja desativar esta tarefa programada?
@@ -236,6 +250,7 @@ pt-BR:
         search: Pesquisar
       navbar:
         batches: Lotes
+        cleaner: Discard Cleaner
         cron_schedules: Agendamentos
         jobs: Tarefas
         live_poll: Acompanhamento ao Vivo

data/config/locales/ru.yml

@@ -35,6 +35,20 @@ ru:
         callback_jobs: Коллбеки
       table:
         no_batches_found: Группы заданий не найдены.
+    cleaner:
+      index:
+        all: All
+        class: Class
+        exception: Exception
+        grouped_by_class: Discards grouped by Class
+        grouped_by_exception: Discards grouped by Exception
+        last_1_hour: Last 1 hour
+        last_24_hours: Last 24 hours
+        last_3_days: Last 3 days
+        last_3_hours: Last 3 hours
+        last_7_days: Last 7 days
+        title: Discard Cleaner
+        total: Total
     cron_entries:
       actions:
         confirm_disable: Вы уверены, что хотите отключить эту задачу cron?
@@ -262,6 +276,7 @@ ru:
         search: Поиск
       navbar:
         batches: Пакетные задания
+        cleaner: Discard Cleaner
         cron_schedules: Cron
         jobs: Задания
         live_poll: Обновления в реальном времени

data/config/locales/tr.yml

@@ -35,6 +35,20 @@ tr:
         callback_jobs: Geri Çağırma İşleri
       table:
         no_batches_found: Toplu İşlem bulunamadı.
+    cleaner:
+      index:
+        all: All
+        class: Class
+        exception: Exception
+        grouped_by_class: Discards grouped by Class
+        grouped_by_exception: Discards grouped by Exception
+        last_1_hour: Last 1 hour
+        last_24_hours: Last 24 hours
+        last_3_days: Last 3 days
+        last_3_hours: Last 3 hours
+        last_7_days: Last 7 days
+        title: Discard Cleaner
+        total: Total
     cron_entries:
       actions:
         confirm_disable: Bu cron girişini devre dışı bırakmak istediğinizden emin misiniz?
@@ -236,6 +250,7 @@ tr:
         search: Ara
       navbar:
         batches: Toplu İşler
+        cleaner: Discard Cleaner
         cron_schedules: Cron
         jobs: İşler
         live_poll: Anlık Güncelleme

data/config/locales/uk.yml

@@ -35,6 +35,20 @@ uk:
         callback_jobs: Задачі з зворотнім викликом
       table:
         no_batches_found: Пакети не знайдені.
+    cleaner:
+      index:
+        all: All
+        class: Class
+        exception: Exception
+        grouped_by_class: Discards grouped by Class
+        grouped_by_exception: Discards grouped by Exception
+        last_1_hour: Last 1 hour
+        last_24_hours: Last 24 hours
+        last_3_days: Last 3 days
+        last_3_hours: Last 3 hours
+        last_7_days: Last 7 days
+        title: Discard Cleaner
+        total: Total
     cron_entries:
       actions:
         confirm_disable: Ви впевнені, що хочете вимкнути цю cron-запис?
@@ -262,6 +276,7 @@ uk:
         search: Пошук
       navbar:
         batches: Пакети
+        cleaner: Discard Cleaner
         cron_schedules: Cron
         jobs: Задачі
         live_poll: Живе Опитування

data/config/routes.rb

@@ -34,8 +34,8 @@ GoodJob::Engine.routes.draw do
   end
 
   resources :processes, only: %i[index]
-
   resources :performance, only: %i[index show]
+  resources :cleaner, only: %i[index]
 
   scope :frontend, controller: :frontends, defaults: { version: GoodJob::VERSION.tr(".", "-") } do
     get "modules/:version/:id", action: :module, as: :frontend_module, constraints: { format: 'js' }

data/lib/good_job/capsule_tracker.rb

@@ -144,7 +144,7 @@ module GoodJob # :nodoc:
     # Tests whether an active advisory lock has been taken on the record.
     # @return [Boolean]
     def advisory_locked?
-      @advisory_locked_connection&.weakref_alive? && @advisory_locked_connection&.active?
+      @advisory_locked_connection&.weakref_alive? && @advisory_locked_connection.active?
     end
 
     # @!visibility private

data/lib/good_job/cron_manager.rb

@@ -26,11 +26,13 @@ module GoodJob # :nodoc:
     end
 
     # Execution configuration to be scheduled
-    # @return [Hash]
+    # @return [Array<CronEntry>]
     attr_reader :cron_entries
 
     # @param cron_entries [Array<CronEntry>]
     # @param start_on_initialize [Boolean]
+    # @param graceful_restart_period [ActiveSupport::Duration, nil]
+    # @param executor [Concurrent::Executor]
     def initialize(cron_entries = [], start_on_initialize: false, graceful_restart_period: nil, executor: Concurrent.global_io_executor)
       @executor = executor
       @running = false
@@ -82,16 +84,26 @@ module GoodJob # :nodoc:
 
     # Enqueues a scheduled task
     # @param cron_entry [CronEntry] the CronEntry object to schedule
-    # @param previously_at [Date, Time, ActiveSupport::TimeWithZone, nil] the last, +in-memory+, scheduled time the cron task was intended to run
-    def create_task(cron_entry, previously_at: nil)
-      cron_at = cron_entry.next_at(previously_at: previously_at)
-      delay = [(cron_at - Time.current).to_f, 0].max
-      future = Concurrent::ScheduledTask.new(delay, args: [self, cron_entry, cron_at], executor: @executor) do |thr_scheduler, thr_cron_entry, thr_cron_at|
-        # Re-schedule the next cron task before executing the current task
-        thr_scheduler.create_task(thr_cron_entry, previously_at: thr_cron_at)
-
-        Rails.application.executor.wrap do
-          cron_entry.enqueue(thr_cron_at) if thr_cron_entry.enabled?
+    # @param at [Time, nil] When a task needs to optionally be rescheduled because of clock-drift or other inaccuracy
+    # @param previously_at [Time, nil] the last +in-memory+ scheduled time the cron task was intended to run
+    def create_task(cron_entry, at: nil, previously_at: nil)
+      cron_at = at || cron_entry.next_at(previously_at: previously_at)
+
+      # ScheduledTask runs immediately if delay is <= 0.01; avoid ever scheduling the task before the intended time
+      # https://github.com/ruby-concurrency/concurrent-ruby/blob/56227a4c3ebdd53b8b0976eb8296ceb7a093496f/lib/concurrent-ruby/concurrent/executor/timer_set.rb#L97
+      delay = cron_at <= Time.current ? 0.0 : [(cron_at - Time.current).to_f, 0.02].max
+
+      future = Concurrent::ScheduledTask.new(delay, args: [self, cron_entry, cron_at, previously_at], executor: @executor) do |thr_manager, thr_cron_entry, thr_cron_at|
+        if thr_cron_at && thr_cron_at > Time.current
+          # If clock drift or other inaccuracy, reschedule the task again
+          thr_manager.create_task(thr_cron_entry, at: thr_cron_at, previously_at: previously_at)
+        else
+          # Re-schedule the next cron task before executing the current task
+          thr_manager.create_task(thr_cron_entry, previously_at: thr_cron_at)
+
+          Rails.application.executor.wrap do
+            cron_entry.enqueue(thr_cron_at) if thr_cron_entry.enabled?
+          end
         end
       end
 
@@ -108,7 +120,7 @@ module GoodJob # :nodoc:
 
       time_period = @graceful_restart_period.ago..Time.current
       cron_entry.within(time_period).each do |cron_at|
-        future = Concurrent::Future.new(args: [self, cron_entry, cron_at], executor: @executor) do |_thr_scheduler, thr_cron_entry, thr_cron_at|
+        future = Concurrent::Future.new(args: [self, cron_entry, cron_at], executor: @executor) do |_thr_manager, thr_cron_entry, thr_cron_at|
           Rails.application.executor.wrap do
             cron_entry.enqueue(thr_cron_at) if thr_cron_entry.enabled?
           end

data/lib/good_job/version.rb

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

data/lib/good_job.rb

@@ -203,11 +203,11 @@ module GoodJob
   # If you are preserving job records this way, use this method regularly to
   # destroy old records and preserve space in your database.
   # @param older_than [nil,Numeric,ActiveSupport::Duration] Jobs older than this will be destroyed (default: +86400+).
+  # @param include_discarded [Boolean] Whether or not to destroy discarded jobs (default: per +cleanup_discarded_jobs+ config option)
   # @return [Integer] Number of job execution records and batches that were destroyed.
-  def self.cleanup_preserved_jobs(older_than: nil, in_batches_of: 1_000)
+  def self.cleanup_preserved_jobs(older_than: nil, in_batches_of: 1_000, include_discarded: GoodJob.configuration.cleanup_discarded_jobs?)
     older_than ||= GoodJob.configuration.cleanup_preserved_jobs_before_seconds_ago
     timestamp = Time.current - older_than
-    include_discarded = GoodJob.configuration.cleanup_discarded_jobs?
 
     ActiveSupport::Notifications.instrument("cleanup_preserved_jobs.good_job", { older_than: older_than, timestamp: timestamp }) do |payload|
       deleted_jobs_count = 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 4.4.2
+  version: 4.5.1
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-18 00:00:00.000000000 Z
+date: 2024-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -254,6 +254,7 @@ files:
 - app/charts/good_job/scheduled_by_queue_chart.rb
 - app/controllers/good_job/application_controller.rb
 - app/controllers/good_job/batches_controller.rb
+- app/controllers/good_job/cleaner_controller.rb
 - app/controllers/good_job/cron_entries_controller.rb
 - app/controllers/good_job/frontends_controller.rb
 - app/controllers/good_job/jobs_controller.rb
@@ -305,6 +306,7 @@ files:
 - app/views/good_job/batches/_table.erb
 - app/views/good_job/batches/index.html.erb
 - app/views/good_job/batches/show.html.erb
+- app/views/good_job/cleaner/index.html.erb
 - app/views/good_job/cron_entries/index.html.erb
 - app/views/good_job/cron_entries/show.html.erb
 - app/views/good_job/jobs/_executions.erb