good_job 3.0.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 381f27d5c5f8fe4be355f3b2ea1e1f0bcd76f545d7378183b4faca9d6770a6cd
-  data.tar.gz: 20b315936f49810e9aa70e0bc8c2a37c140436212f2e84d15e05d275c93715ee
+  metadata.gz: 9ecbb75f2764a72686acb96367389abb1900321b5cf1292d6522aa8094c68451
+  data.tar.gz: 43a5305a9f2610c1544d6e52c61f0b338771b07d92d6493fed0058ad33bbc045
 SHA512:
-  metadata.gz: f0f107ba18b85211856391873650309997a63e16d2ddc34e55bdbdb3f8563e595f2e3176cfaa1e13f65eaca70e75df0ff950562740d51c1a82bc885dfd3421ea
-  data.tar.gz: cc47bc865ca1264238b5253f9ab06c8ebdc840e5adaf3220366f622626f8fac872c5fec5cd3b939acfd60137af6d984a0b2a61aad19ccd3ea277708f3c291414
+  metadata.gz: 0e637579c190a3f3d1aba6c02f6a71e2193d9e5c4bb449a3d4d9571093150a25a1c293ac3f5c541d2fae09aeffff771692fa7ef58bc8ed672f61a2c9d35a7e74
+  data.tar.gz: bc669b4d1628f7ff4b885787c65a38a57ad020aa168c3ae85f0c6bb26c9f0e19b64947682b0c99cf3eb28c2d660e1d79ee6095000a72340f09229d1679fa5dfe

data/CHANGELOG.md

@@ -1,5 +1,62 @@
 # Changelog
 
+## [v3.2.0](https://github.com/bensheldon/good_job/tree/v3.2.0) (2022-07-12)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.1.0...v3.2.0)
+
+**Merged pull requests:**
+
+- Ordered queue handling by workers [\#665](https://github.com/bensheldon/good_job/pull/665) ([jrochkind](https://github.com/jrochkind))
+
+## [v3.1.0](https://github.com/bensheldon/good_job/tree/v3.1.0) (2022-07-11)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.0.2...v3.1.0)
+
+**Implemented enhancements:**
+
+- Improve Dashboard display of parameters \(CronEntry kwargs; Process configuration; Job and Execution database values\) [\#662](https://github.com/bensheldon/good_job/pull/662) ([bensheldon](https://github.com/bensheldon))
+
+**Fixed bugs:**
+
+- Don't delegate `GoodJob::Job#status` to executions to avoid race condition [\#661](https://github.com/bensheldon/good_job/pull/661) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- How to suppress repetitive logs in development? [\#658](https://github.com/bensheldon/good_job/issues/658)
+- 500 Internal Server Error Exception in web interface trying to view running jobs [\#656](https://github.com/bensheldon/good_job/issues/656)
+- Cron schedule page in dashboard not showing kwargs [\#608](https://github.com/bensheldon/good_job/issues/608)
+- Paralelism x database connections [\#569](https://github.com/bensheldon/good_job/issues/569)
+
+**Merged pull requests:**
+
+- Show job/cron/process counts in the Navbar [\#663](https://github.com/bensheldon/good_job/pull/663) ([bensheldon](https://github.com/bensheldon))
+- Dequeing should be first-in first-out [\#651](https://github.com/bensheldon/good_job/pull/651) ([jrochkind](https://github.com/jrochkind))
+
+## [v3.0.2](https://github.com/bensheldon/good_job/tree/v3.0.2) (2022-07-10)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.0.1...v3.0.2)
+
+**Fixed bugs:**
+
+- Copy forward concurrency key value when retrying a job, rather than regenerating it [\#622](https://github.com/bensheldon/good_job/issues/622)
+- All concurrency controlled jobs throw exceptions and are rescheduled if they are called using perform\_now [\#591](https://github.com/bensheldon/good_job/issues/591)
+
+**Closed issues:**
+
+- Queue config not respecting limits [\#659](https://github.com/bensheldon/good_job/issues/659)
+- UI engine does not work without explicit require [\#646](https://github.com/bensheldon/good_job/issues/646)
+- Should `:inline` adapter mode retry jobs? [\#611](https://github.com/bensheldon/good_job/issues/611)
+- Error Job Not Preserved  [\#594](https://github.com/bensheldon/good_job/issues/594)
+- Jobs never get run... [\#516](https://github.com/bensheldon/good_job/issues/516)
+- Release GoodJob 3.0 [\#507](https://github.com/bensheldon/good_job/issues/507)
+- Improve security of Gem releases [\#422](https://github.com/bensheldon/good_job/issues/422)
+
+**Merged pull requests:**
+
+- Preserve initial concurrency key when retrying jobs [\#657](https://github.com/bensheldon/good_job/pull/657) ([bensheldon](https://github.com/bensheldon))
+- Add Dashboard troubleshooting note to explicitly require the engine [\#654](https://github.com/bensheldon/good_job/pull/654) ([bensheldon](https://github.com/bensheldon))
+- Removes wrong parentheses [\#653](https://github.com/bensheldon/good_job/pull/653) ([esasse](https://github.com/esasse))
+
 ## [v3.0.1](https://github.com/bensheldon/good_job/tree/v3.0.1) (2022-07-02)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v3.0.0...v3.0.1)

data/README.md

@@ -370,6 +370,16 @@ GoodJob includes a Dashboard as a mountable `Rails::Engine`.
 
     See more at [Monitor and preserve worked jobs](#monitor-and-preserve-worked-jobs)
 
+**Troubleshooting the Dashboard:** Some applications are unable to autoload the Goodjob Engine. To work around this, explicitly require the Engine at the top of your `config/application.rb` file, immediately after Rails is required and before Bundler requires the Rails' groups.
+
+```ruby
+# config/application.rb
+require_relative 'boot'
+require 'rails/all'
+require 'good_job/engine' # <= Add this line
+# ...
+```
+
 #### API-only Rails applications
 
 API-only Rails applications may not have all of the required Rack middleware for the GoodJob Dashboard to function. To re-add the middlware:
@@ -655,7 +665,7 @@ By default, GoodJob creates a single thread execution pool that will execute job
 
     A pool is configured with the following syntax `<participating_queues>:<thread_count>`:
 
-    - `<participating_queues>`: either `queue1,queue2` (only those queues), `*` (all) or `-queue1,queue2` (all except those queues).
+    - `<participating_queues>`: either `queue1,queue2` (only those queues), `+queue1,queue2` (only those queues, and processed in order), `*` (all) or `-queue1,queue2` (all except those queues).
     - `<thread_count>`: a count overriding for this specific pool the global `max-threads`.
 
     Pool configurations are separated with a semicolon (;) in the `queues` configuration
@@ -673,6 +683,12 @@ By default, GoodJob creates a single thread execution pool that will execute job
     - `-transactional_messages,batch_processing`: execute jobs enqueued on _any_ queue _excluding_ `transactional_messages` or `batch_processing`, with up to 2 threads.
     - `*`: execute jobs on any queue, with up to 5 threads (as configured by `--max-threads=5`).
 
+    When a pool is performing jobs from multiple queues, jobs will be performed from specified queues, ordered by priority and creation time. To perform jobs from queues in the queues' given order, use the `+` modifier. In this example, jobs in `batch_processing` will be performed only when there are no jobs in `transactional_messages`:
+
+    ```bash
+    bundle exec good_job --queues="+transactional_messages,batch_processing"
+    ```
+
     Configuration can be injected by environment variables too:
 
     ```bash
@@ -713,7 +729,7 @@ Each GoodJob execution thread requires its own database connection that is autom
 
 ```yaml
 # config/database.yml
-pool: <%= ENV.fetch("RAILS_MAX_THREADS", 5).to_i + 3 + (ENV.fetch("GOOD_JOB_MAX_THREADS", 5).to_i %>
+pool: <%= ENV.fetch("RAILS_MAX_THREADS", 5).to_i + 3 + ENV.fetch("GOOD_JOB_MAX_THREADS", 5).to_i %>
 ```
 
 To calculate the total number of the database connections you'll need:

data/app/controllers/good_job/jobs_controller.rb

@@ -56,7 +56,7 @@ module GoodJob
     end
 
     def show
-      @job = Job.find(params[:id])
+      @job = Job.includes_advisory_locks.find(params[:id])
     end
 
     def discard

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

@@ -38,7 +38,7 @@
           </div>
         <% end %>
         <div>
-          <%= tag.pre JSON.pretty_generate(execution.serialized_params), id: dom_id(execution, "params"), class: "collapse bg-light card card-body p-3 my-3" %>
+          <%= tag.pre JSON.pretty_generate(execution.display_serialized_params), id: dom_id(execution, "params"), class: "collapse bg-light card card-body p-3 my-3" %>
         </div>
       <% end %>
     <% end %>

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

@@ -13,7 +13,7 @@
             <th>Executions</th>
             <th>Error</th>
             <th>
-              ActiveJob Params&nbsp;
+              Parameters&nbsp;
               <%= tag.button "Toggle", type: "button", class: "btn btn-sm btn-outline-primary", role: "button",
                              data: { bs_toggle: "collapse", bs_target: ".job-params" },
                              aria: { expanded: false, controls: jobs.map { |job| "##{dom_id(job, "params")}" }.join(" ") }
@@ -71,7 +71,7 @@
                                  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" %>
+                  <%= tag.pre JSON.pretty_generate(job.display_serialized_params), id: dom_id(job, "params"), class: "collapse job-params" %>
                 </td>
                 <td>
                   <div class="text-nowrap">

data/app/views/good_job/jobs/show.html.erb

@@ -54,4 +54,4 @@
   <%= tag.pre @job.serialized_params["arguments"].map(&:inspect).join(', ') %>
 </div>
 
-<%= render 'executions', executions: @job.executions.reverse %>
+<%= render 'executions', executions: @job.executions.includes_advisory_locks.reverse %>

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

@@ -11,7 +11,7 @@
         <li class="nav-item">
           <%= link_to url_for({state: name}), class: "nav-link #{"active" if params[:state] == name}" do %>
             <%= t(name, scope: 'good_job.status') %>
-            <span class="badge bg-primary rounded-pill <%= "bg-secondary" if count == 0 %>"><%= count %></span>
+            <span class="badge bg-primary rounded-pill <%= "bg-secondary" if count == 0 %>"><%= number_with_delimiter(count) %></span>
           <% end %>
         </li>
       <% end %>

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

@@ -8,13 +8,25 @@
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
       <ul class="navbar-nav me-auto">
         <li class="nav-item">
-          <%= link_to t(".jobs"), jobs_path, class: ["nav-link", ("active" if controller_name == 'jobs')] %>
+          <%= 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) %></span>
+        <% end %>
         </li>
         <li class="nav-item">
-          <%= link_to t(".cron_schedules"), cron_entries_path, class: ["nav-link", ("active" if controller_name == 'cron_entries')] %>
+          <%= 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>
+        <% end %>
         </li>
         <li class="nav-item">
-          <%= link_to t(".processes"), processes_path, class: ["nav-link", ("active" if controller_name == 'processes')] %>
+          <%= link_to processes_path, class: ["nav-link", ("active" if controller_name == 'processes')] do %>
+            <%= t(".processes") %>
+            <% processes_count = GoodJob::Process.count %>
+            <span class="badge bg-secondary rounded-pill <%= "bg-danger" if processes_count == 0 %>"><%= processes_count %></span>
+          <% end %>
         </li>
       </ul>
       <div class="nav-item pe-2">

data/config/locales/en.yml

@@ -63,3 +63,22 @@ en:
       retried: Retried
       running: Running
       scheduled: Scheduled
+  number:
+    format:
+      delimiter: ","
+      separator: "."
+    human:
+      decimal_units:
+        format: "%n%u"
+        units:
+          billion: B
+          hundred: ''
+          million: M
+          quadrillion: Q
+          thousand: K
+          trillion: T
+          unit: ''
+      format:
+        delimiter: ","
+        precision: 3
+        separator: "."

data/config/locales/es.yml

@@ -63,3 +63,22 @@ es:
       retried: reintentado
       running: Corriendo
       scheduled: Programado
+  number:
+    format:
+      delimiter: " "
+      separator: ","
+    human:
+      decimal_units:
+        format: "%n%u"
+        units:
+          billion: B
+          hundred: ''
+          million: M
+          quadrillion: q
+          thousand: k
+          trillion: T
+          unit: ''
+      format:
+        delimiter: " "
+        precision: 3
+        separator: ","

data/config/locales/nl.yml

@@ -63,3 +63,22 @@ nl:
       retried: Opnieuw geprobeerd
       running: Rennen
       scheduled: Gepland
+  number:
+    format:
+      delimiter: "."
+      separator: ","
+    human:
+      decimal_units:
+        format: "%n%u"
+        units:
+          billion: B
+          hundred: ''
+          million: M
+          quadrillion: Q
+          thousand: K
+          trillion: T
+          unit: ''
+      format:
+        delimiter: "."
+        precision: 3
+        separator: ","

data/config/locales/ru.yml

@@ -87,3 +87,22 @@ ru:
       retried: Повторная попытка
       running: Бег
       scheduled: по расписанию
+  number:
+    format:
+      delimiter: " "
+      separator: ","
+    human:
+      decimal_units:
+        format: "%n%u"
+        units:
+          billion: Б
+          hundred: ''
+          million: М
+          quadrillion: Q
+          thousand: К
+          trillion: Т
+          unit: ''
+      format:
+        delimiter: " "
+        precision: 3
+        separator: ","

data/lib/good_job/active_job_extensions/concurrency.rb

@@ -10,8 +10,18 @@ module GoodJob
         end
       end
 
+      module Prepends
+        def deserialize(job_data)
+          super
+          self.good_job_concurrency_key = job_data['good_job_concurrency_key']
+        end
+      end
+
       included do
+        prepend Prepends
+
         class_attribute :good_job_concurrency_config, instance_accessor: false, default: {}
+        attr_writer :good_job_concurrency_key
 
         around_enqueue do |job, block|
           # Don't attempt to enforce concurrency limits with other queue adapters.
@@ -27,6 +37,8 @@ module GoodJob
                       (total_limit.present? && (0...Float::INFINITY).cover?(total_limit))
           next(block.call) unless has_limit
 
+          # Only generate the concurrency key on the initial enqueue in case it is dynamic
+          job.good_job_concurrency_key ||= job._good_job_concurrency_key
           key = job.good_job_concurrency_key
           next(block.call) if key.blank?
 
@@ -80,7 +92,15 @@ module GoodJob
         end
       end
 
+      # Existing or dynamically generated concurrency key
+      # @return [Object] concurrency key
       def good_job_concurrency_key
+        @good_job_concurrency_key || _good_job_concurrency_key
+      end
+
+      # Generates the concurrency key from the configuration
+      # @return [Object] concurrency key
+      def _good_job_concurrency_key
         key = self.class.good_job_concurrency_config[:key]
         return if key.blank?
 

data/lib/good_job/job_performer.rb

@@ -24,7 +24,7 @@ module GoodJob
     # Perform the next eligible job
     # @return [Object, nil] Returns job result or +nil+ if no job was found
     def next
-      job_query.perform_with_advisory_lock
+      job_query.perform_with_advisory_lock(parsed_queues: parsed_queues)
     end
 
     # Tests whether this performer should be used in GoodJob's current state.

data/lib/good_job/version.rb

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

data/lib/models/good_job/cron_entry.rb

@@ -112,9 +112,11 @@ module GoodJob # :nodoc:
         class: job_class,
         cron: schedule,
         set: display_property(set),
-        args: display_property(args),
         description: display_property(description),
-      }
+      }.tap do |properties|
+        properties[:args] = display_property(args) if args.present?
+        properties[:kwargs] = display_property(kwargs) if kwargs.present?
+      end
     end
 
     private

data/lib/models/good_job/execution.rb

@@ -29,15 +29,21 @@ module GoodJob
     #     not match.
     #   - +{ include: Array<String> }+ indicates the listed queue names should
     #     match.
+    #   - +{ include: Array<String>, ordered_queues: true }+ indicates the listed
+    #     queue names should match, and dequeue should respect queue order.
     # @example
     #   GoodJob::Execution.queue_parser('-queue1,queue2')
     #   => { exclude: [ 'queue1', 'queue2' ] }
     def self.queue_parser(string)
       string = string.presence || '*'
 
-      if string.first == '-'
+      case string.first
+      when '-'
         exclude_queues = true
         string = string[1..-1]
+      when '+'
+        ordered_queues = true
+        string = string[1..-1]
       end
 
       queues = string.split(',').map(&:strip)
@@ -46,6 +52,11 @@ module GoodJob
         { all: true }
       elsif exclude_queues
         { exclude: queues }
+      elsif ordered_queues
+        {
+          include: queues,
+          ordered_queues: true,
+        }
       else
         { include: queues }
       end
@@ -88,6 +99,42 @@ module GoodJob
     # @return [ActiveRecord::Relation]
     scope :priority_ordered, -> { order('priority DESC NULLS LAST') }
 
+    # Order jobs by created_at, for first-in first-out
+    # @!method creation_ordered
+    # @!scope class
+    # @return [ActiveRecord:Relation]
+    scope :creation_ordered, -> { order('created_at ASC') }
+
+    # Order jobs for de-queueing
+    # @!method dequeueing_ordered
+    # @!scope class
+    # @param parsed_queues [Hash]
+    #   optional output of .queue_parser, parsed queues, will be used for
+    #   ordered queues.
+    # @return [ActiveRecord::Relation]
+    scope :dequeueing_ordered, (lambda do |parsed_queues|
+      relation = self
+      relation = relation.queue_ordered(parsed_queues[:include]) if parsed_queues && parsed_queues[:ordered_queues] && parsed_queues[:include]
+      relation = relation.priority_ordered.creation_ordered
+
+      relation
+    end)
+
+    # Order jobs in order of queues in array param
+    # @!method queue_ordered
+    # @!scope class
+    # @param queues [Array<string] ordered names of queues
+    # @return [ActiveRecord::Relation]
+    scope :queue_ordered, (lambda do |queues|
+      clauses = queues.map.with_index do |queue_name, index|
+        "WHEN queue_name = '#{queue_name}' THEN #{index}"
+      end
+
+      order(
+        Arel.sql("(CASE #{clauses.join(' ')} ELSE #{queues.length} END)")
+      )
+    end)
+
     # Order jobs by scheduled or created (oldest first).
     # @!method schedule_ordered
     # @!scope class
@@ -153,8 +200,8 @@ module GoodJob
     #   return value for the job's +#perform+ method, and the exception the job
     #   raised, if any (if the job raised, then the second array entry will be
     #   +nil+). If there were no jobs to execute, returns +nil+.
-    def self.perform_with_advisory_lock
-      unfinished.priority_ordered.only_scheduled.limit(1).with_advisory_lock(unlock_session: true) do |executions|
+    def self.perform_with_advisory_lock(parsed_queues: nil)
+      unfinished.dequeueing_ordered(parsed_queues).only_scheduled.limit(1).with_advisory_lock(unlock_session: true) do |executions|
         execution = executions.first
         break if execution.blank?
         break :unlocked unless execution&.executable?
@@ -279,7 +326,9 @@ module GoodJob
     # @return [Symbol]
     def status
       if finished_at.present?
-        if error.present?
+        if error.present? && retried_good_job_id.present?
+          :retried
+        elsif error.present? && retried_good_job_id.nil?
           :discarded
         else
           :finished
@@ -297,8 +346,20 @@ module GoodJob
       end
     end
 
+    # Return formatted serialized_params for display in the dashboard
+    # @return [Hash]
+    def display_serialized_params
+      serialized_params.merge({
+                                _good_job: attributes.except('serialized_params', 'locktype', 'owns_advisory_lock'),
+                              })
+    end
+
     def running?
-      performed_at? && !finished_at?
+      if has_attribute?(:locktype)
+        self['locktype'].present?
+      else
+        advisory_locked?
+      end
     end
 
     def number
@@ -314,7 +375,7 @@ module GoodJob
     def queue_latency
       now = Time.zone.now
       expected_start = scheduled_at || created_at
-      actual_start = performed_at || now
+      actual_start = performed_at || finished_at || now
 
       actual_start - expected_start unless expected_start >= now
     end
@@ -330,6 +391,7 @@ module GoodJob
       serialized_params.deep_dup
                        .tap do |job_data|
         job_data["provider_job_id"] = id
+        job_data["good_job_concurrency_key"] = concurrency_key if concurrency_key
       end
     end
 

data/lib/models/good_job/job.rb

@@ -3,7 +3,8 @@ module GoodJob
   # ActiveRecord model that represents an +ActiveJob+ job.
   # There is not a table in the database whose discrete rows represents "Jobs".
   # The +good_jobs+ table is a table of individual {GoodJob::Execution}s that share the same +active_job_id+.
-  # A single row from the +good_jobs+ table of executions is fetched to represent an Job
+  # A single row from the +good_jobs+ table of executions is fetched to represent a Job.
+  #
   class Job < BaseRecord
     include Filterable
     include Lockable
@@ -72,9 +73,51 @@ module GoodJob
       serialized_params['job_class']
     end
 
-    # The status of the Job, based on the state of its most recent execution.
-    # @return [Symbol]
-    delegate :status, :last_status_at, to: :head_execution
+    def last_status_at
+      finished_at || performed_at || scheduled_at || created_at
+    end
+
+    def status
+      if finished_at.present?
+        if error.present? && retried_good_job_id.present?
+          :retried
+        elsif error.present? && retried_good_job_id.nil?
+          :discarded
+        else
+          :finished
+        end
+      elsif (scheduled_at || created_at) > DateTime.current
+        if serialized_params.fetch('executions', 0) > 1
+          :retried
+        else
+          :scheduled
+        end
+      elsif running?
+        :running
+      else
+        :queued
+      end
+    end
+
+    # Override #reload to add a custom scope to ensure the reloaded record is the head execution
+    # @return [Job]
+    def reload(options = nil)
+      self.class.connection.clear_query_cache
+
+      # override with the `where(retried_good_job_id: nil)` scope
+      override_query = self.class.where(retried_good_job_id: nil)
+      fresh_object =
+        if options && options[:lock]
+          self.class.unscoped { override_query.lock(options[:lock]).find(id) }
+        else
+          self.class.unscoped { override_query.find(id) }
+        end
+
+      @attributes = fresh_object.instance_variable_get(:@attributes)
+      @new_record = false
+      @previously_new_record = false
+      self
+    end
 
     # This job's most recent {Execution}
     # @param reload [Booelan] whether to reload executions
@@ -94,7 +137,7 @@ module GoodJob
     # The number of times this job has been executed, according to ActiveJob's serialized state.
     # @return [Numeric]
     def executions_count
-      aj_count = head_execution.serialized_params.fetch('executions', 0)
+      aj_count = serialized_params.fetch('executions', 0)
       # The execution count within serialized_params is not updated
       # once the underlying execution has been executed.
       if status.in? [:discarded, :finished, :running]
@@ -114,7 +157,15 @@ module GoodJob
     # If the job has been retried, the error will be fetched from the previous {Execution} record.
     # @return [String]
     def recent_error
-      head_execution.error || executions[-2]&.error
+      error || executions[-2]&.error
+    end
+
+    # Return formatted serialized_params for display in the dashboard
+    # @return [Hash]
+    def display_serialized_params
+      serialized_params.merge({
+                                _good_job: attributes.except('serialized_params', 'locktype', 'owns_advisory_lock'),
+                              })
     end
 
     # Tests whether the job is being executed right now.
@@ -192,7 +243,6 @@ module GoodJob
 
         raise ActionForStateMismatchError if execution.finished_at.present?
 
-        execution = head_execution(reload: true)
         execution.update(scheduled_at: scheduled_at)
       end
     end

data/lib/models/good_job/process.rb

@@ -45,6 +45,8 @@ module GoodJob # :nodoc:
         hostname: Socket.gethostname,
         pid: ::Process.pid,
         proctitle: $PROGRAM_NAME,
+        preserve_job_records: GoodJob.preserve_job_records,
+        retry_on_unhandled_error: GoodJob.retry_on_unhandled_error,
         schedulers: GoodJob::Scheduler.instances.map(&:name),
       }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-02 00:00:00.000000000 Z
+date: 2022-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob