good_job 2.99.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a19a18e7245448f7f44c99a492f4ca08f311cc96da9a50f4ba4d7b704685017
-  data.tar.gz: 07330c1a31b873b172066d9e7946b0184b250f7276fe041617c378b35ce8beca
+  metadata.gz: 03dafffb596eaa6c7cf0994a40586039ac38215dcb0942850b1067deec0ac04d
+  data.tar.gz: 917cbb1baebf9e6f8f7767d54606d0a07b02d3c28971e65369603f71500abf34
 SHA512:
-  metadata.gz: 7a38a4a1bc73cf7378f24850b1e58b9b7cf6fbf83ef7aff8fcdba7d2c77ce782e273a3bc946efcf21d98157523b68183bb36efcbd570d253eab73cc7e8542c99
-  data.tar.gz: c97a8235d5b0041237909d6bb551bcccf2de5a4e2fa07bbbb12496a245aa6c4408896baa2a752b0a9f3eb6a1eb037189baa68e6d9979b57ef640e08750609d27
+  metadata.gz: fd0c36fee775613d86ba832c6777eb9c72b651630f24b6236ea1b5373957d045121c3d5a0aea528cded163da638b7b6e41c3b155915186350bd1675e27b3ffee
+  data.tar.gz: 041f30d08e8128d81ffdbf59e19f958761b809d9993facb5919119346cfc30b2f8da715658be47e94f317ffed3953381a93141a6bdc6540ab3f0b186604970f0

data/CHANGELOG.md

@@ -1,5 +1,58 @@
 # Changelog
 
+## [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)
+
+**Closed issues:**
+
+- ERROR:  relation "good\_jobs" does not exist at character 454 [\#308](https://github.com/bensheldon/good_job/issues/308)
+
+**Merged pull requests:**
+
+- Fix `GoodJob.cleanup_preserved_jobs` to use `delete_all` instead of `destroy_all` [\#652](https://github.com/bensheldon/good_job/pull/652) ([bensheldon](https://github.com/bensheldon))
+- Create codeql-analysis.yml [\#648](https://github.com/bensheldon/good_job/pull/648) ([bensheldon](https://github.com/bensheldon))
+
+## [v3.0.0](https://github.com/bensheldon/good_job/tree/v3.0.0) (2022-06-26)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v2.99.0...v3.0.0)
+
+**Implemented enhancements:**
+
+- By default, preserve job records and automatically them clean up [\#545](https://github.com/bensheldon/good_job/pull/545) ([bensheldon](https://github.com/bensheldon))
+
+**Merged pull requests:**
+
+- Update tests to reflect default of `GoodJob.preserve_job_records = true`; update appraisal Gemfiles too [\#643](https://github.com/bensheldon/good_job/pull/643) ([bensheldon](https://github.com/bensheldon))
+- Remove database migration shims and old migrations [\#642](https://github.com/bensheldon/good_job/pull/642) ([bensheldon](https://github.com/bensheldon))
+- Remove support for EOL Rails 5.2 [\#637](https://github.com/bensheldon/good_job/pull/637) ([bensheldon](https://github.com/bensheldon))
+- Remove/rename deprecated behavior and constants for GoodJob v3  [\#633](https://github.com/bensheldon/good_job/pull/633) ([bensheldon](https://github.com/bensheldon))
+
 ## [v2.99.0](https://github.com/bensheldon/good_job/tree/v2.99.0) (2022-06-26)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v2.17.1...v2.99.0)
@@ -996,7 +1049,6 @@
 
 **Closed issues:**
 
-- ERROR:  relation "good\_jobs" does not exist at character 454 [\#308](https://github.com/bensheldon/good_job/issues/308)
 - Add Frozen String Literal to all files [\#298](https://github.com/bensheldon/good_job/issues/298)
 - Support for good\_job without Rails? [\#295](https://github.com/bensheldon/good_job/issues/295)
 

data/README.md

@@ -144,9 +144,9 @@ For more of the story of GoodJob, read the [introductory blog post](https://isla
 
 ## Compatibility
 
-- **Ruby on Rails:** 5.2+
-- **Ruby:** MRI 2.5+. JRuby 9.2.13+
-- **Postgres:** 9.6+
+- **Ruby on Rails:** 6.0+
+- **Ruby:** Ruby 2.5+. JRuby 9.2.13+
+- **Postgres:** 10.0+
 
 ## Configuration
 
@@ -280,7 +280,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`.
 - `inline_execution_respects_schedule` (boolean) Opt-in to future behavior of inline execution respecting scheduled jobs. Defaults to `false`.
 - `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`)
+- `preserve_job_records` (boolean) keeps job records in your database even after jobs are completed. (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:
 
@@ -311,8 +311,8 @@ 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`. 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.preserve_job_records`** (boolean) keeps job records in your database even after jobs are completed. (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: `false`)
 - **`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:
@@ -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:
@@ -395,8 +405,6 @@ The Dashboard can be set to automatically refresh by checking "Live Poll" in the
 
 GoodJob can extend ActiveJob to provide limits on concurrently running jobs, either at time of _enqueue_ or at _perform_. Limiting concurrency can help prevent duplicate, double or unecessary jobs from being enqueued, or race conditions when performing, for example when interacting with 3rd-party APIs.
 
-**Note:** Limiting concurrency at _enqueue_ requires Rails 6.0+ because Rails 5.2 cannot halt ActiveJob callbacks.
-
 ```ruby
 class MyJob < ApplicationJob
   include GoodJob::ActiveJobExtensions::Concurrency
@@ -564,9 +572,9 @@ GoodJob.on_thread_error = -> (exception) { Raven.capture_exception(exception) }
 
 #### Retries
 
-By default, GoodJob will automatically and immediately retry a job when an exception is raised to GoodJob.
+By default, GoodJob relies on ActiveJob's retry functionality.
 
-However, ActiveJob can be configured to retry an infinite number of times, with an exponential backoff. Using ActiveJob's `retry_on` prevents exceptions from reaching GoodJob:
+ActiveJob can be configured to retry an infinite number of times, with an exponential backoff. Using ActiveJob's `retry_on` prevents exceptions from reaching GoodJob:
 
 ```ruby
 class ApplicationJob < ActiveJob::Base
@@ -575,14 +583,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. 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
-GoodJob.retry_on_unhandled_error = false
-```
-
-Alternatively, pass a block to `retry_on` to handle the final exception instead of raising it to GoodJob:
+When using `retry_on` with _a limited number of retries_, the final exception will not be rescued and will raise to GoodJob's error handler. To avoid this, pass a block to `retry_on` to handle the final exception instead of raising it to GoodJob:
 
 ```ruby
 class ApplicationJob < ActiveJob::Base
@@ -613,9 +614,11 @@ class ApplicationJob < ActiveJob::Base
 end
 ```
 
+By default, jobs will not be retried unless `retry_on` is configured. This can be overridden by setting `GoodJob.retry_on_unhandled_error` to `true`; GoodJob will then retry the failing job immediately and infinitely, potentially causing high load.
+
 #### ActionMailer retries
 
-Any configuration in `ApplicationJob` will have to be duplicated on `ActionMailer::MailDeliveryJob` (`ActionMailer::DeliveryJob` in Rails 5.2 or earlier) because ActionMailer uses a custom class, `ActionMailer::MailDeliveryJob`, which inherits from `ActiveJob::Base`,  rather than your applications `ApplicationJob`.
+Any configuration in `ApplicationJob` will have to be duplicated on `ActionMailer::MailDeliveryJob` because ActionMailer uses that custom class which inherits from `ActiveJob::Base`,  rather than your application's `ApplicationJob`.
 
 You can use an initializer to configure `ActionMailer::MailDeliveryJob`, for example:
 
@@ -720,7 +723,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:
@@ -869,22 +872,31 @@ If your application is already using an ActiveJob backend, you will need to inst
 
 GoodJob is fully instrumented with [`ActiveSupport::Notifications`](https://edgeguides.rubyonrails.org/active_support_instrumentation.html#introduction-to-instrumentation).
 
-By default, GoodJob will destroy job records after they are run, regardless of whether they succeed or not (raising a kind of `StandardError`), unless they are interrupted (raising a kind of `Exception`).
+By default, GoodJob will preserve job records for 14 days after they are run, regardless of whether they succeed or not (raising a kind of `StandardError`), unless they are interrupted (raising a kind of `Exception`).
 
-To preserve job records for later inspection, set an initializer:
+To not preserve job records for later inspection, set an initializer:
 
 ```ruby
 # config/initializers/good_job.rb
-GoodJob.preserve_job_records = true
+GoodJob.preserve_job_records = false # defaults to true, or `false` or `:on_unhandled_error`
+```
+
+GoodJob will automatically delete these job records after 14 days. The retention period, as well as the frequency GoodJob checks for deletable records can be configured:
+
+```ruby
+
+config.cleanup_preserved_jobs_before_seconds_ago = 14.days.to_i
+config.cleanup_interval_jobs = 1_000 # Number of executed jobs between deletion sweeps.
+config.cleanup_interval_seconds = 10.minutes.to_i # Number of seconds between deletion sweeps.
 ```
 
-It is also necessary to destroy these preserved jobs from the database after a certain time period:
+It is also possible to manually trigger a cleanup:
 
 - For example, in a Rake task:
 
     ```ruby
-    GoodJob.cleanup_preserved_jobs # Will keep 1 day of job records by default.
-    GoodJob.cleanup_preserved_jobs(older_than: 7.days) # It also takes custom arguments.
+    GoodJob.cleanup_preserved_jobs # Will use default retention period
+    GoodJob.cleanup_preserved_jobs(older_than: 7.days) # custom retention period
     ```
 
 - For example, using the `good_job` command-line utility:

data/app/charts/good_job/scheduled_by_queue_chart.rb

@@ -9,7 +9,7 @@ module GoodJob
     def data
       end_time = Time.current
       start_time = end_time - 1.day
-      table_name = GoodJob::ActiveJobJob.table_name
+      table_name = GoodJob::Job.table_name
 
       count_query = Arel.sql(GoodJob::Execution.pg_or_jdbc_query(<<~SQL.squish))
         SELECT *

data/app/controllers/good_job/jobs_controller.rb

@@ -10,8 +10,8 @@ module GoodJob
       destroy: "destroyed",
     }.freeze
 
-    rescue_from GoodJob::ActiveJobJob::AdapterNotGoodJobError,
-                GoodJob::ActiveJobJob::ActionForStateMismatchError,
+    rescue_from GoodJob::Job::AdapterNotGoodJobError,
+                GoodJob::Job::ActionForStateMismatchError,
                 with: :redirect_on_error
 
     def index
@@ -26,7 +26,7 @@ module GoodJob
                JobsFilter.new(params).filtered_query
              else
                job_ids = params.fetch(:job_ids, [])
-               ActiveJobJob.where(active_job_id: job_ids)
+               Job.where(active_job_id: job_ids)
              end
 
       processed_jobs = jobs.map do |job|
@@ -42,7 +42,7 @@ module GoodJob
         end
 
         job
-      rescue GoodJob::ActiveJobJob::ActionForStateMismatchError
+      rescue GoodJob::Job::ActionForStateMismatchError
         nil
       end.compact
 
@@ -56,29 +56,29 @@ module GoodJob
     end
 
     def show
-      @job = ActiveJobJob.find(params[:id])
+      @job = Job.find(params[:id])
     end
 
     def discard
-      @job = ActiveJobJob.find(params[:id])
+      @job = Job.find(params[:id])
       @job.discard_job(DISCARD_MESSAGE)
       redirect_back(fallback_location: jobs_path, notice: "Job has been discarded")
     end
 
     def reschedule
-      @job = ActiveJobJob.find(params[:id])
+      @job = Job.find(params[:id])
       @job.reschedule_job
       redirect_back(fallback_location: jobs_path, notice: "Job has been rescheduled")
     end
 
     def retry
-      @job = ActiveJobJob.find(params[:id])
+      @job = Job.find(params[:id])
       @job.retry_job
       redirect_back(fallback_location: jobs_path, notice: "Job has been retried")
     end
 
     def destroy
-      @job = ActiveJobJob.find(params[:id])
+      @job = Job.find(params[:id])
       @job.destroy_job
       redirect_back(fallback_location: jobs_path, notice: "Job has been destroyed")
     end
@@ -87,9 +87,9 @@ module GoodJob
 
     def redirect_on_error(exception)
       alert = case exception
-              when GoodJob::ActiveJobJob::AdapterNotGoodJobError
+              when GoodJob::Job::AdapterNotGoodJobError
                 "ActiveJob Queue Adapter must be GoodJob."
-              when GoodJob::ActiveJobJob::ActionForStateMismatchError
+              when GoodJob::Job::ActionForStateMismatchError
                 "Job is not in an appropriate state for this action."
               else
                 exception.to_s

data/app/controllers/good_job/processes_controller.rb

@@ -2,7 +2,7 @@
 module GoodJob
   class ProcessesController < GoodJob::ApplicationController
     def index
-      @processes = GoodJob::Process.active.order(created_at: :desc) if GoodJob::Process.migrated?
+      @processes = GoodJob::Process.active.order(created_at: :desc)
     end
   end
 end

data/app/filters/good_job/jobs_filter.rb

@@ -31,7 +31,7 @@ module GoodJob
         when 'scheduled'
           query = query.scheduled
         when 'running'
-          query = query.running.select("#{GoodJob::ActiveJobJob.table_name}.*", 'pg_locks.locktype')
+          query = query.running.select("#{GoodJob::Job.table_name}.*", 'pg_locks.locktype')
         when 'queued'
           query = query.queued
         end
@@ -47,7 +47,7 @@ module GoodJob
     private
 
     def default_base_query
-      GoodJob::ActiveJobJob.all
+      GoodJob::Job.all
     end
   end
 end

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

@@ -3,15 +3,7 @@
 </div>
 
 <div data-live-poll-region="processes">
-  <% if !GoodJob::Process.migrated? %>
-    <div class="card my-3">
-      <div class="card-body">
-        <p class="card-text">
-          <em>Feature unavailable because of pending database migration.</em>
-        </p>
-      </div>
-    </div>
-  <% elsif @processes.present? %>
+  <% if @processes.present? %>
     <div class="card my-3">
       <div class="table-responsive">
         <table class="table card-table table-bordered table-hover table-sm mb-0">

data/app/views/layouts/good_job/application.html.erb

@@ -16,7 +16,7 @@
   <%= tag.script "", src: rails_ujs_path(format: :js, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
 
   <%= tag.script "", src: es_module_shims_path(format: :js, v: GoodJob::VERSION, locale: nil), async: true, nonce: content_security_policy_nonce %>
-  <% importmaps = { imports: GoodJob::AssetsController.js_modules.keys.each_with_object({}) { |module_name, imports| imports[module_name] = modules_path(module_name, format: :js, locale: nil, v: GoodJob::VERSION) } } %>
+  <% importmaps = { imports: GoodJob::AssetsController.js_modules.keys.index_with { |module_name| modules_path(module_name, format: :js, locale: nil, v: GoodJob::VERSION) } } %>
   <%= tag.script importmaps.to_json.html_safe, type: "importmap", nonce: content_security_policy_nonce %>
   <%= tag.script "", src: scripts_path(format: :js, v: GoodJob::VERSION, locale: nil), type: "module", nonce: content_security_policy_nonce %>
 </head>

data/lib/generators/good_job/templates/update/migrations/01_create_good_jobs.rb.erb

@@ -18,6 +18,12 @@ class CreateGoodJobs < ActiveRecord::Migration<%= migration_version %>
       t.text :concurrency_key
       t.text :cron_key
       t.uuid :retried_good_job_id
+      t.timestamp :cron_at
+    end
+
+    create_table :good_job_processes, id: :uuid do |t|
+      t.timestamps
+      t.jsonb :state
     end
 
     add_index :good_jobs, :scheduled_at, where: "(finished_at IS NULL)", name: "index_good_jobs_on_scheduled_at"
@@ -25,5 +31,8 @@ class CreateGoodJobs < ActiveRecord::Migration<%= migration_version %>
     add_index :good_jobs, [:active_job_id, :created_at], name: :index_good_jobs_on_active_job_id_and_created_at
     add_index :good_jobs, :concurrency_key, where: "(finished_at IS NULL)", name: :index_good_jobs_on_concurrency_key_when_unfinished
     add_index :good_jobs, [:cron_key, :created_at], name: :index_good_jobs_on_cron_key_and_created_at
+    add_index :good_jobs, [:cron_key, :cron_at], name: :index_good_jobs_on_cron_key_and_cron_at, unique: true
+    add_index :good_jobs, [:active_job_id], name: :index_good_jobs_on_active_job_id
+    add_index :good_jobs, [:finished_at], where: "retried_good_job_id IS NULL AND finished_at IS NOT NULL", name: :index_good_jobs_jobs_on_finished_at
   end
 end

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/adapter.rb

@@ -20,32 +20,16 @@ module GoodJob
     #
     #  The default value depends on the Rails environment:
     #
-    #  - +development+ and +test+: +:inline+
+    #  - +development+: +:async:+
+    #   -+test+: +:inline+
     #  - +production+ and all other environments: +:external+
     #
-    # @param max_threads [Integer, nil] sets the number of threads per scheduler to use when +execution_mode+ is set to +:async+. The +queues+ parameter can specify a number of threads for each group of queues which will override this value. You can also set this with the environment variable +GOOD_JOB_MAX_THREADS+. Defaults to +5+.
-    # @param queues [String, nil] determines which queues to execute jobs from when +execution_mode+ is set to +:async+. See {file:README.md#optimize-queues-threads-and-processes} for more details on the format of this string. You can also set this with the environment variable +GOOD_JOB_QUEUES+. Defaults to +"*"+.
-    # @param poll_interval [Integer, nil] sets the number of seconds between polls for jobs when +execution_mode+ is set to +:async+. You can also set this with the environment variable +GOOD_JOB_POLL_INTERVAL+. Defaults to +1+.
-    # @param start_async_on_initialize [Boolean] whether to start the async scheduler when the adapter is initialized.
-    def initialize(execution_mode: nil, queues: nil, max_threads: nil, poll_interval: nil, start_async_on_initialize: nil)
-      if queues || max_threads || poll_interval || start_async_on_initialize
-        ActiveSupport::Deprecation.warn(
-          "GoodJob::Adapter's execution-related arguments (queues, max_threads, poll_interval, start_async_on_initialize) have been deprecated and will be removed in GoodJob v3. These options should be configured through GoodJob global configuration instead."
-        )
-      end
-
-      @configuration = GoodJob::Configuration.new(
-        {
-          execution_mode: execution_mode,
-          queues: queues,
-          max_threads: max_threads,
-          poll_interval: poll_interval,
-        }
-      )
+    def initialize(execution_mode: nil)
+      @configuration = GoodJob::Configuration.new({ execution_mode: execution_mode })
       @configuration.validate!
       self.class.instances << self
 
-      start_async if start_async_on_initialize || GoodJob.async_ready?
+      start_async if GoodJob.async_ready?
     end
 
     # Enqueues the ActiveJob job to be performed.
@@ -63,11 +47,7 @@ module GoodJob
     # @return [GoodJob::Execution]
     def enqueue_at(active_job, timestamp)
       scheduled_at = timestamp ? Time.zone.at(timestamp) : nil
-
-      if execute_inline?
-        future_scheduled = scheduled_at && scheduled_at > Time.current
-        will_execute_inline = !future_scheduled || (future_scheduled && !@configuration.inline_execution_respects_schedule?)
-      end
+      will_execute_inline = execute_inline? && (scheduled_at.nil? || scheduled_at <= Time.current)
 
       execution = GoodJob::Execution.enqueue(
         active_job,
@@ -76,29 +56,6 @@ module GoodJob
       )
 
       if will_execute_inline
-        if future_scheduled && !@configuration.inline_execution_respects_schedule?
-          ActiveSupport::Deprecation.warn(<<~DEPRECATION)
-            In the next major release, GoodJob will not *inline* execute
-            future-scheduled jobs.
-
-            To opt into this behavior immediately set:
-            `config.good_job.inline_execution_respects_schedule = true`
-
-            To perform jobs inline at any time, use `GoodJob.perform_inline`.
-
-            For example, using time helpers within an integration test:
-
-            ```
-            MyJob.set(wait: 10.minutes).perform_later
-            travel_to(15.minutes.from_now) { GoodJob.perform_inline }
-            ```
-
-            Note: Rails `travel`/`travel_to` time helpers do not have millisecond
-            precision, so you must leave at least 1 second between the schedule
-            and time traveling for the job to be executed.
-          DEPRECATION
-        end
-
         begin
           result = execution.perform
         ensure

data/lib/good_job/configuration.rb

@@ -15,13 +15,13 @@ module GoodJob
     # Default poll interval for async in development environment
     DEFAULT_DEVELOPMENT_ASYNC_POLL_INTERVAL = -1
     # Default number of threads to use per {Scheduler}
-    DEFAULT_MAX_CACHE = 10000
+    DEFAULT_MAX_CACHE = 10_000
     # Default number of seconds to preserve jobs for {CLI#cleanup_preserved_jobs} and {GoodJob.cleanup_preserved_jobs}
-    DEFAULT_CLEANUP_PRESERVED_JOBS_BEFORE_SECONDS_AGO = 24 * 60 * 60
+    DEFAULT_CLEANUP_PRESERVED_JOBS_BEFORE_SECONDS_AGO = 14.days.to_i
     # Default number of jobs to execute between preserved job cleanup runs
-    DEFAULT_CLEANUP_INTERVAL_JOBS = nil
+    DEFAULT_CLEANUP_INTERVAL_JOBS = 1_000
     # Default number of seconds to wait between preserved job cleanup runs
-    DEFAULT_CLEANUP_INTERVAL_SECONDS = nil
+    DEFAULT_CLEANUP_INTERVAL_SECONDS = 10.minutes.to_i
     # Default to always wait for jobs to finish for {Adapter#shutdown}
     DEFAULT_SHUTDOWN_TIMEOUT = -1
     # Default to not running cron

data/lib/good_job/current_thread.rb

@@ -56,8 +56,8 @@ module GoodJob
     # Exports values to hash
     # @return [Hash]
     def self.to_h
-      ACCESSORS.each_with_object({}) do |accessor, hash|
-        hash[accessor] = send(accessor)
+      ACCESSORS.index_with do |accessor|
+        send(accessor)
       end
     end
 

data/lib/good_job/notifier/process_registration.rb

@@ -14,8 +14,6 @@ module GoodJob # :nodoc:
       # Registers the current process.
       def register_process
         GoodJob::Process.with_connection(connection) do
-          next unless Process.migrated?
-
           GoodJob::Process.cleanup
           @process = GoodJob::Process.register
         end
@@ -24,8 +22,6 @@ module GoodJob # :nodoc:
       # Deregisters the current process.
       def deregister_process
         GoodJob::Process.with_connection(connection) do
-          next unless Process.migrated?
-
           @process&.deregister
         end
       end

data/lib/good_job/version.rb

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

data/lib/good_job.rb

@@ -43,23 +43,21 @@ module GoodJob
 
   # @!attribute [rw] preserve_job_records
   #   @!scope class
-  #   Whether to preserve job records in the database after they have finished (default: +false+).
-  #   By default, GoodJob destroys job records after the job is completed successfully.
+  #   Whether to preserve job records in the database after they have finished (default: +true+).
+  #   By default, GoodJob deletes job records after the job is completed successfully.
   #   If you want to preserve jobs for latter inspection, set this to +true+.
   #   If you want to preserve only jobs that finished with error for latter inspection, set this to +:on_unhandled_error+.
-  #   If +true+, you will need to clean out jobs using the +good_job cleanup_preserved_jobs+ CLI command or
-  #   by using +Goodjob.cleanup_preserved_jobs+.
   #   @return [Boolean, nil]
-  mattr_accessor :preserve_job_records, default: false
+  mattr_accessor :preserve_job_records, default: true
 
   # @!attribute [rw] retry_on_unhandled_error
   #   @!scope class
-  #   Whether to re-perform a job when a type of +StandardError+ is raised to GoodJob (default: +true+).
+  #   Whether to re-perform a job when a type of +StandardError+ is raised to GoodJob (default: +false+).
   #   If +true+, causes jobs to be re-queued and retried if they raise an instance of +StandardError+.
   #   If +false+, jobs will be discarded or marked as finished if they raise an instance of +StandardError+.
   #   Instances of +Exception+, like +SIGINT+, will *always* be retried, regardless of this attribute's value.
   #   @return [Boolean, nil]
-  mattr_accessor :retry_on_unhandled_error, default: true
+  mattr_accessor :retry_on_unhandled_error, default: false
 
   # @!attribute [rw] on_thread_error
   #   @!scope class
@@ -143,11 +141,11 @@ module GoodJob
     include_discarded = configuration.cleanup_discarded_jobs?
 
     ActiveSupport::Notifications.instrument("cleanup_preserved_jobs.good_job", { older_than: older_than, timestamp: timestamp }) do |payload|
-      old_jobs = GoodJob::ActiveJobJob.where('finished_at <= ?', timestamp)
+      old_jobs = GoodJob::Job.where('finished_at <= ?', timestamp)
       old_jobs = old_jobs.not_discarded unless include_discarded
       old_jobs_count = old_jobs.count
 
-      GoodJob::Execution.where(job: old_jobs).destroy_all
+      GoodJob::Execution.where(job: old_jobs).delete_all
       payload[:destroyed_records_count] = old_jobs_count
     end
   end