good_job 4.1.1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 660e78528305c41b14c2926d9747037a091b57f952acd14246af99180991b434
-  data.tar.gz: 8bc407843b2d17fbeceb36507eb2e06177460f1bc4b8b4133560e1c4daa6ce3e
+  metadata.gz: 6b8f73f25f420a1b95841f757ef3eae435fc19e442f157bae03af0e751d619a2
+  data.tar.gz: e6737d5a487ed8d43c0c9dc078b72c075784cfb00889835e63b8ca2ba8788333
 SHA512:
-  metadata.gz: 8847a962731fec2c13683d3948e3ae51c0730bbcdd81853dfa3d6c2168bb05105ae2cf4c8f073a9c133d3f634473bdfaf58fefc08b07a0bbb8f51686e4b62ff0
-  data.tar.gz: c89b843399fe9bdc0d492c89ce1f481da62201689cc0f15ada8d73135308be1ee23295e54bae1fa586d1c9a50e2ca62a072784a4ac0fb9a5be3ee83ed374b1d7
+  metadata.gz: fd113e9ed755d014fdbd324bd7aaf62837e384176412d7eeeb4bf277fbd7ed9cb5eba82a39dc4f1e54f4753e635f8c8076194f45d1de461f92301864081cf08f
+  data.tar.gz: 9e028ead209f0467bfe8e2d323ebfe812503ef8310a792270604b525f4aeb5429b7857fbf644bfbc600e14593c0545cf0e628f309aabb8276ca34c6f3ae98367

data/CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## [v4.2.0](https://github.com/bensheldon/good_job/tree/v4.2.0) (2024-08-16)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v4.1.1...v4.2.0)
+
+**Implemented enhancements:**
+
+- Add retry functionality for batches [\#1456](https://github.com/bensheldon/good_job/pull/1456) ([bensheldon](https://github.com/bensheldon))
+
+**Fixed bugs:**
+
+- respect perform\_throttle even if perform\_limit is provided [\#1470](https://github.com/bensheldon/good_job/pull/1470) ([doits](https://github.com/doits))
+- Do not use advisory lock on heartbeat in production  [\#1451](https://github.com/bensheldon/good_job/pull/1451) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- `perform_limit` and `perform_throttle` don't work both [\#1469](https://github.com/bensheldon/good_job/issues/1469)
+- Edge rails changes breaking binding commits [\#1466](https://github.com/bensheldon/good_job/issues/1466)
+- Dynamic creation of CronEntries [\#1457](https://github.com/bensheldon/good_job/issues/1457)
+- Batch callback job not enqueued after success of retried job [\#1450](https://github.com/bensheldon/good_job/issues/1450)
+
+**Merged pull requests:**
+
+- Update cron documentation to remove confusion about multiple processes [\#1467](https://github.com/bensheldon/good_job/pull/1467) ([bensheldon](https://github.com/bensheldon))
+- Update compatibility matrix, remove compatibility code [\#1465](https://github.com/bensheldon/good_job/pull/1465) ([Earlopain](https://github.com/Earlopain))
+- Run tests with warnings enabled [\#1462](https://github.com/bensheldon/good_job/pull/1462) ([Earlopain](https://github.com/Earlopain))
+- Add appraisal for Rails 7.2; bracket lowest PG version instead of enumerating all [\#1460](https://github.com/bensheldon/good_job/pull/1460) ([bensheldon](https://github.com/bensheldon))
+- Fix a few method redefinition warnings [\#1459](https://github.com/bensheldon/good_job/pull/1459) ([Earlopain](https://github.com/Earlopain))
+- Bump rexml from 3.3.2 to 3.3.3 [\#1455](https://github.com/bensheldon/good_job/pull/1455) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Remove `smaller_number_is_higher_priority` option from v4 [\#1453](https://github.com/bensheldon/good_job/pull/1453) ([bensheldon](https://github.com/bensheldon))
+
 ## [v4.1.1](https://github.com/bensheldon/good_job/tree/v4.1.1) (2024-07-31)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v1.99.2...v4.1.1)

data/README.md

@@ -164,8 +164,8 @@ For more of the story of GoodJob, read the [introductory blog post](https://isla
 
 ## Compatibility
 
-- **Ruby on Rails:** 6.0+
-- **Ruby:** Ruby 2.6+. JRuby 9.3+
+- **Ruby on Rails:** 6.1+
+- **Ruby:** Ruby 3.0+. JRuby 9.4+
 - **Postgres:** 10.0+
 
 ## Configuration
@@ -307,7 +307,7 @@ Available configuration options are:
 - `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: `true`)
-- `smaller_number_is_higher_priority` (boolean) allows you to specifiy that jobs should be run in ascending order of priority (smallest priority numbers first). This will be enabled by default in the next major version of GoodJob (v4.0), but jobs with the highest priority number are run first by default in all earlier versions of GoodJob.
+- `advisory_lock_heartbeat` (boolean) whether to use an advisory lock for the purpose of determining whether an execeution process is active. (Default `true` in Development; `false` in other environments)
 - `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`)
 - `on_thread_error` (proc, lambda, or callable) will be called when there is an Exception. It can be useful for logging errors to bug tracking services, like Sentry or Airbrake. Example:
 
@@ -499,7 +499,9 @@ As a second example, you may wish to show a link to a log aggregator next to eac
 
 ### Job priority
 
-Higher priority numbers run first in all versions of GoodJob v3.x and below. GoodJob v4.x will change job `priority` to give smaller numbers higher priority (default: `0`), in accordance with Active Job's definition of priority (see #524). To opt-in to this behavior now, set `config.good_job.smaller_number_is_higher_priority = true` in your GoodJob initializer or `application.rb`.
+Smaller `priority` values have higher priority and run first (default: `0`), in accordance with [Active Job's definition of priority](https://github.com/rails/rails/blob/e17faead4f2aff28da079d50f02ea5b015322d5b/activejob/lib/active_job/core.rb#L22).
+
+Prior to GoodJob v4, this was reversed: higher priority numbers ran first in all versions of GoodJob v3.x and below. When migrating from v3 to v4, new behavior can be opted into by setting `config.good_job.smaller_number_is_higher_priority = true` in your GoodJob initializer or `application.rb`.
 
 ### Labelled jobs
 
@@ -611,9 +613,7 @@ GoodJob's concurrency control strategy for `perform_limit` is "optimistic retry
 
 GoodJob can enqueue Active Job jobs on a recurring basis that can be used as a replacement for cron.
 
-Cron-style jobs can be performed by any GoodJob process (e.g., CLI or `:async` execution mode) that has `config.good_job.enable_cron` set to `true`. That is, one or more job executor processes can be configured to perform recurring jobs.
-
-GoodJob's cron uses unique indexes to ensure that only a single job is enqueued at the given time interval. In order for this to work, GoodJob must preserve cron-created job records; these records will be automatically deleted like any other preserved record.
+Cron-style jobs can be enequeued by any GoodJob process (e.g., CLI or `:async` execution mode) that has `config.good_job.enable_cron` set to `true`. Enabling cron on multiple processes will not enqueue duplicate jobs; GoodJob's cron uses unique indexes to ensure that only a single job is enqueued for a given time interval.  In order for this to work, GoodJob must preserve cron-created job records; these records will be automatically deleted like any other preserved record.
 
 Cron-format is parsed by the [`fugit`](https://github.com/floraison/fugit) gem, which has support for seconds-level resolution (e.g. `* * * * * *`) and natural language parsing (e.g. `every second`).
 
@@ -622,8 +622,8 @@ If you use the [Dashboard](#dashboard) the scheduled tasks can be viewed in the
 ```ruby
 # config/environments/application.rb or a specific environment e.g. production.rb
 
-# Enable cron in this process, e.g., only run on the first Heroku worker process
-config.good_job.enable_cron = ENV['DYNO'] == 'worker.1' # or `true` or via $GOOD_JOB_ENABLE_CRON
+# Enable cron enqueuing in this process
+config.good_job.enable_cron = true
 
 # Configure cron with a hash that has a unique key for each recurring job
 config.good_job.cron = {
@@ -890,7 +890,7 @@ To upgrade:
 
 Notable changes:
 
-- Only supports Rails 6.1+, CRuby 3.0+ and JRuby 9.4+, Postgres 12+. Rails 6.0 is no longer supported. CRuby 2.6 and 2.7 are no longer supported. JRuby 9.3 is no longer supported.
+- Only supports Rails 6.1+, CRuby 3.0+ and JRuby 9.4+. Rails 6.0 is no longer supported. CRuby 2.6 and 2.7 are no longer supported. JRuby 9.3 is no longer supported.
 - Changes job `priority` to give smaller numbers higher priority (default: `0`), in accordance with Active Job's definition of priority.
 - Enqueues and executes jobs via the `GoodJob::Job` model instead of `GoodJob::Execution`
 - Setting `config.good_job.cleanup_interval_jobs`, `GOOD_JOB_CLEANUP_INTERVAL_JOBS`, `config.good_job.cleanup_interval_seconds`, or `GOOD_JOB_CLEANUP_INTERVAL_SECONDS` to `nil` or `""` no longer disables count- or time-based cleanups. Set to `false` to disable, or `-1` to run a cleanup after every job execution.

data/app/controllers/good_job/batches_controller.rb

@@ -9,5 +9,11 @@ module GoodJob
     def show
       @batch = GoodJob::BatchRecord.find(params[:id])
     end
+
+    def retry
+      @batch = GoodJob::Batch.find(params[:id])
+      @batch.retry
+      redirect_back(fallback_location: batches_path, notice: t(".notice"))
+    end
   end
 end

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

@@ -15,9 +15,9 @@ module GoodJob
         discarded: 5,
       }
       if Gem::Version.new(Rails.version) >= Gem::Version.new('7.1.0.a')
-        enum :error_event, error_event_enum, validate: { allow_nil: true }
+        enum :error_event, error_event_enum, validate: { allow_nil: true }, scopes: false
       else
-        enum error_event: error_event_enum
+        enum error_event: error_event_enum, _scopes: false
       end
     end
   end

data/app/models/good_job/batch.rb

@@ -92,10 +92,12 @@ module GoodJob
       if record.new_record?
         record.save!
       else
-        record.with_advisory_lock(function: "pg_advisory_lock") do
-          record.enqueued_at_will_change!
-          record.finished_at_will_change!
-          record.update!(enqueued_at: nil, finished_at: nil)
+        record.transaction do
+          record.with_advisory_lock(function: "pg_advisory_xact_lock") do
+            record.enqueued_at_will_change!
+            record.finished_at_will_change!
+            record.update!(enqueued_at: nil, finished_at: nil)
+          end
         end
       end
 
@@ -135,6 +137,21 @@ module GoodJob
       buffer.active_jobs
     end
 
+    def retry
+      Rails.application.executor.wrap do
+        buffer = GoodJob::Adapter::InlineBuffer.capture do
+          record.transaction do
+            record.with_advisory_lock(function: "pg_advisory_xact_lock") do
+              record.update!(discarded_at: nil, finished_at: nil)
+              record.jobs.discarded.each(&:retry_job)
+              record._continue_discard_or_finish(lock: false)
+            end
+          end
+        end
+        buffer.call
+      end
+    end
+
     def active_jobs
       record.jobs.map(&:active_job)
     end

data/app/models/good_job/batch_record.rb

@@ -84,11 +84,7 @@ module GoodJob
       end
     end
 
-    if Rails.gem_version < Gem::Version.new('6.1.0.alpha')
-      # serialize does not yet take a default value, must set via Attributes API
-      attribute :serialized_properties, :json, default: -> { {} }
-      serialize :serialized_properties, PropertySerializer
-    elsif Rails.gem_version < Gem::Version.new('7.1.0.alpha')
+    if Rails.gem_version < Gem::Version.new('7.1.0.alpha')
       serialize :serialized_properties, PropertySerializer, default: -> { {} }
     else
       serialize :serialized_properties, coder: PropertySerializer, default: -> { {} }

data/app/models/good_job/job.rb

@@ -57,9 +57,9 @@ module GoodJob
     # Execution errored, will run in the future
     scope :retried, -> { where(finished_at: nil).where(coalesce_scheduled_at_created_at.gt(bind_value('coalesce', Time.current, ActiveRecord::Type::DateTime))).where(params_execution_count.gt(1)) }
     # Immediate/Scheduled time to run has passed, waiting for an available thread run
-    scope :queued, -> { where(performed_at: nil, finished_at: nil).where(coalesce_scheduled_at_created_at.lteq(bind_value('coalesce', Time.current, ActiveRecord::Type::DateTime))).joins_advisory_locks.where(pg_locks: { locktype: nil }) }
+    scope :queued, -> { where(performed_at: nil, finished_at: nil).where(coalesce_scheduled_at_created_at.lteq(bind_value('coalesce', Time.current, ActiveRecord::Type::DateTime))) }
     # Advisory locked and executing
-    scope :running, -> { where.not(performed_at: nil).where(finished_at: nil).joins_advisory_locks.where.not(pg_locks: { locktype: nil }) }
+    scope :running, -> { where.not(performed_at: nil).where(finished_at: nil) }
     # Finished executing (succeeded or discarded)
     scope :finished, -> { where.not(finished_at: nil) }
     # Completed executing successfully
@@ -99,13 +99,7 @@ module GoodJob
     # @!method priority_ordered
     # @!scope class
     # @return [ActiveRecord::Relation]
-    scope :priority_ordered, (lambda do
-      if GoodJob.configuration.smaller_number_is_higher_priority
-        order('priority ASC NULLS LAST')
-      else
-        order('priority DESC NULLS LAST')
-      end
-    end)
+    scope :priority_ordered, -> { order('priority ASC NULLS LAST') }
 
     # Order jobs by created_at, for first-in first-out
     # @!method creation_ordered
@@ -146,24 +140,6 @@ module GoodJob
     # @return [ActiveRecord::Relation]
     scope :schedule_ordered, -> { order(coalesce_scheduled_at_created_at.asc) }
 
-    # Get completed jobs before the given timestamp. If no timestamp is
-    # provided, get *all* completed jobs. By default, GoodJob
-    # destroys jobs after they're completed, meaning this returns no jobs.
-    # However, if you have changed {GoodJob.preserve_job_records}, this may
-    # find completed Jobs.
-    # @!method finished(timestamp = nil)
-    # @!scope class
-    # @param timestamp (Float)
-    #   Get jobs that finished before this time (in epoch time).
-    # @return [ActiveRecord::Relation]
-    scope :finished, ->(timestamp = nil) { timestamp ? where(arel_table['finished_at'].lteq(bind_value('finished_at', timestamp, ActiveRecord::Type::DateTime))) : where.not(finished_at: nil) }
-
-    # Get Jobs that started but not finished yet.
-    # @!method running
-    # @!scope class
-    # @return [ActiveRecord::Relation]
-    scope :running, -> { where.not(performed_at: nil).where(finished_at: nil) }
-
     # Get Jobs on queues that match the given queue string.
     # @!method queue_string(string)
     # @!scope class

data/app/models/good_job/process.rb

@@ -20,9 +20,9 @@ module GoodJob # :nodoc:
       advisory: 0,
     }
     if Gem::Version.new(Rails.version) >= Gem::Version.new('7.1.0.a')
-      enum :lock_type, lock_type_enum, validate: { allow_nil: true }
+      enum :lock_type, lock_type_enum, validate: { allow_nil: true }, scopes: false
     else
-      enum lock_type: lock_type_enum
+      enum lock_type: lock_type_enum, _scopes: false
     end
 
     has_many :locked_jobs, class_name: "GoodJob::Job", foreign_key: :locked_by_id, inverse_of: :locked_by_process, dependent: nil
@@ -56,7 +56,7 @@ module GoodJob # :nodoc:
       end
     end
 
-    def self.create_record(id:, with_advisory_lock: false)
+    def self.find_or_create_record(id:, with_advisory_lock: false)
       attributes = {
         id: id,
         state: process_state,
@@ -66,6 +66,17 @@ module GoodJob # :nodoc:
         attributes[:lock_type] = :advisory
       end
       create!(attributes)
+    rescue ActiveRecord::RecordNotUnique
+      find_by(id: id).tap do |existing_record|
+        next unless existing_record
+
+        if with_advisory_lock
+          existing_record.advisory_lock!
+          existing_record.update(lock_type: :advisory, state: process_state, updated_at: Time.current)
+        else
+          existing_record.update(lock_type: nil, state: process_state, updated_at: Time.current)
+        end
+      end
     end
 
     def self.process_state

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

@@ -59,6 +59,12 @@
                 <%= batch.jobs.size %>
               </div>
               <div class="col text-end">
+                <% if batch.discarded? %>
+                  <%= link_to retry_batch_path(batch), method: :put, class: "btn btn-sm btn-outline-primary", title: t("good_job.batches.actions.retry"), data: { confirm: t("good_job.batches.actions.confirm_retry") } do %>
+                    <%= render_icon "arrow_clockwise" %>
+                    <%= t "good_job.batches.actions.retry" %>
+                  <% end %>
+                <% end %>
                 <%= tag.button type: "button", class: "btn btn-sm text-muted", role: "button",
                                title: t("good_job.actions.inspect"),
                                data: { bs_toggle: "collapse", bs_target: "##{dom_id(batch, 'properties')}" },

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

@@ -10,6 +10,14 @@
           <h2 class="h5 mt-2"><%= @batch.description %></h2>
         </nav>
       </div>
+      <div class="col text-end">
+        <% if @batch.discarded? %>
+          <%= button_to retry_batch_path(@batch), method: :put, class: "btn btn-sm btn-outline-primary", form_class: "d-inline-block", aria: { label: t("good_job.batches.actions.retry") }, title: t("good_job.batches.actions.retry"), data: { confirm: t("good_job.batches.actions.confirm_retry") } do %>
+            <%= render_icon "arrow_clockwise" %>
+            <%= t "good_job.actions.retry" %>
+          <% end %>
+        <% end %>
+      </div>
     </div>
   </div>
 </div>

data/config/locales/de.yml

@@ -9,6 +9,9 @@ de:
       reschedule: Umplanen
       retry: Wiederholen
     batches:
+      actions:
+        confirm_retry: Bist du sicher, dass du diesen Batch wiederholen willst?
+        retry: Batch wiederholen
       index:
         older_batches: Ältere Batches
         title: Batches
@@ -24,6 +27,8 @@ de:
           retry: Job wiederholen
           title: Aktionen
         no_jobs_found: Keine Jobs gefunden.
+      retry:
+        notice: Batch wurde wiederholt
       show:
         attributes: Attribute
         batched_jobs: Batch-Jobs

data/config/locales/en.yml

@@ -9,6 +9,9 @@ en:
       reschedule: Reschedule
       retry: Retry
     batches:
+      actions:
+        confirm_retry: Are you sure you want to retry this batch?
+        retry: Retry
       index:
         older_batches: Older batches
         title: Batches
@@ -24,6 +27,8 @@ en:
           retry: Retry Job
           title: Actions
         no_jobs_found: No jobs found.
+      retry:
+        notice: Batch has been retried
       show:
         attributes: Attributes
         batched_jobs: Batched Jobs

data/config/locales/es.yml

@@ -9,6 +9,9 @@ es:
       reschedule: Reprogramar
       retry: Reintentar
     batches:
+      actions:
+        confirm_retry: "¿Estás seguro que querés reintentar este lote?"
+        retry: Reintentar
       index:
         older_batches: Lotes anteriores
         title: Lotes
@@ -24,6 +27,8 @@ es:
           retry: Reintentar tarea
           title: Acciones
         no_jobs_found: No hay tareas.
+      retry:
+        notice: El lote ha sido reintentado
       show:
         attributes: Atributos
         batched_jobs: Tareas en lote

data/config/locales/fr.yml

@@ -9,6 +9,9 @@ fr:
       reschedule: Reprogrammer
       retry: Recommencez
     batches:
+      actions:
+        confirm_retry: Voulez-vous vraiment réessayer ce lot ?
+        retry: Réessayer
       index:
         older_batches: Lots plus anciens
         title: Lots
@@ -24,6 +27,8 @@ fr:
           retry: Réessayer le job
           title: Actions
         no_jobs_found: Aucun job trouvé.
+      retry:
+        notice: Le lot a été réessayé
       show:
         attributes: Attributs
         batched_jobs: Jobs groupés

data/config/locales/it.yml

@@ -9,6 +9,9 @@ it:
       reschedule: Riprogramma
       retry: Riprova
     batches:
+      actions:
+        confirm_retry: Sei sicuro di voler riprovare questo batch?
+        retry: Riprova
       index:
         older_batches: Batch più vecchi
         title: Batch
@@ -24,6 +27,8 @@ it:
           retry: Riprova job
           title: Azioni
         no_jobs_found: Nessun job trovato.
+      retry:
+        notice: Il batch è stato riprovato
       show:
         attributes: Attributi
         batched_jobs: Job raggruppati

data/config/locales/ja.yml

@@ -9,6 +9,9 @@ ja:
       reschedule: 再スケジュールする
       retry: 再試行する
     batches:
+      actions:
+        confirm_retry: このバッチを再試行してもよろしいですか？
+        retry: バッチを再試行する
       index:
         older_batches: より古いバッチ
         title: バッチ
@@ -24,6 +27,8 @@ ja:
           retry: ジョブを再試行する
           title: アクション
         no_jobs_found: ジョブが見つかりませんでした。
+      retry:
+        notice: バッチが再試行されました
       show:
         attributes: 属性
         batched_jobs: バッチ処理されたジョブ
@@ -122,9 +127,9 @@ ja:
       discard:
         notice: ジョブが破棄されました
       executions:
-        application_trace: Application Trace
-        full_trace: Full Trace
-        in_queue: 待機中
+        application_trace: アプリケーショントレース
+        full_trace: フルトレース
+        in_queue: キュー内
         runtime: 実行時間
         title: 実行
       force_discard:
@@ -198,8 +203,8 @@ ja:
       index:
         average_duration: 平均所要時間
         chart_title: ジョブの総実行時間（秒
-        executions: 処刑
-        job_class: 職種
+        executions: 実行
+        job_class: ジョブクラス
         maximum_duration: 最大持続時間
         minimum_duration: 最小期間
         title: パフォーマンス

data/config/locales/ko.yml

@@ -9,6 +9,9 @@ ko:
       reschedule: 재예약하기
       retry: 다시 시도하기
     batches:
+      actions:
+        confirm_retry: 이 배치를 다시 시도하시겠습니까?
+        retry: 배치 다시 시도
       index:
         older_batches: 더 오래된 배치
         title: 배치
@@ -24,6 +27,8 @@ ko:
           retry: 작업 다시 시도
           title: 작업 액션
         no_jobs_found: 작업이 없습니다.
+      retry:
+        notice: 배치가 다시 시도되었습니다.
       show:
         attributes: 속성
         batched_jobs: 배치된 작업
@@ -122,8 +127,8 @@ ko:
       discard:
         notice: 작업이 폐기되었습니다.
       executions:
-        application_trace: Application Trace
-        full_trace: Full Trace
+        application_trace: 애플리케이션 추적
+        full_trace: 전체 추적
         in_queue: 대기 중
         runtime: 실행 시간
         title: 실행
@@ -198,8 +203,8 @@ ko:
       index:
         average_duration: 평균 지속 시간
         chart_title: 총 작업 실행 시간(초)
-        executions: 처형
-        job_class: 직업군
+        executions: 실행
+        job_class: 작업 클래스
         maximum_duration: 최대 기간
         minimum_duration: 최소 기간
         title: 성능

data/config/locales/nl.yml

@@ -9,6 +9,9 @@ nl:
       reschedule: Opnieuw plannen
       retry: Opnieuw proberen
     batches:
+      actions:
+        confirm_retry: Weet je zeker dat je deze batch opnieuw wilt proberen?
+        retry: Batch opnieuw proberen
       index:
         older_batches: Oudere partijen
         title: Partijen
@@ -24,6 +27,8 @@ nl:
           retry: Taak opnieuw
           title: Acties
         no_jobs_found: Geen vacatures gevonden.
+      retry:
+        notice: Batch is opnieuw geprobeerd
       show:
         attributes: attributen
         batched_jobs: Gegroepeerde banen

data/config/locales/pt-BR.yml

@@ -9,6 +9,9 @@ pt-BR:
       reschedule: Reagendar
       retry: Tentar novamente
     batches:
+      actions:
+        confirm_retry: Tem certeza de que deseja tentar novamente este lote?
+        retry: Tentar novamente
       index:
         older_batches: Lotes antigos
         title: Lotes
@@ -24,6 +27,8 @@ pt-BR:
           retry: Tentar Tarefa Novamente
           title: Ações
         no_jobs_found: Nenhuma tarefa encontrada.
+      retry:
+        notice: O lote foi tentado novamente
       show:
         attributes: Atributos
         batched_jobs: Tarefas em Lote

data/config/locales/ru.yml

@@ -9,6 +9,9 @@ ru:
       reschedule: Перенести
       retry: Повторить попытку
     batches:
+      actions:
+        confirm_retry: Вы уверены, что хотите повторить эту группу заданий?
+        retry: Повторить группу заданий
       index:
         older_batches: Старые группы заданий
         title: Группы заданий
@@ -24,6 +27,8 @@ ru:
           retry: Повторить задание
           title: Действия
         no_jobs_found: Заданий не найдено
+      retry:
+        notice: Группа заданий была повторена
       show:
         attributes: Атрибуты
         batched_jobs: Группы заданий

data/config/locales/tr.yml

@@ -9,6 +9,9 @@ tr:
       reschedule: Yeniden planla
       retry: Tekrar dene
     batches:
+      actions:
+        confirm_retry: Bu grubu yeniden denemek istediğinizden emin misiniz?
+        retry: Grubu yeniden dene
       index:
         older_batches: Daha eski toplu işlemler
         title: Toplu İşlemler
@@ -24,6 +27,8 @@ tr:
           retry: İşi Tekrar Dene
           title: İşlemler
         no_jobs_found: İş bulunamadı.
+      retry:
+        notice: Grup yeniden denendi
       show:
         attributes: Özellikler
         batched_jobs: Toplu İşlenmiş İşler

data/config/locales/uk.yml

@@ -9,6 +9,9 @@ uk:
       reschedule: Перепланувати
       retry: Повторити
     batches:
+      actions:
+        confirm_retry: Ви впевнені, що хочете повторити цю групу завдань?
+        retry: Повторити групу завдань
       index:
         older_batches: Старі пакети
         title: Пакети
@@ -24,6 +27,8 @@ uk:
           retry: Повторити задачу
           title: Дії
         no_jobs_found: Задачі не знайдені.
+      retry:
+        notice: Групу завдань було повторено
       show:
         attributes: Атрибути
         batched_jobs: Задачі в пакеті
@@ -256,7 +261,7 @@ uk:
         queue_name: Назва черги
         search: Пошук
       navbar:
-        batches: Batches
+        batches: Пакети
         cron_schedules: Cron
         jobs: Задачі
         live_poll: Живе Опитування

data/config/routes.rb

@@ -19,7 +19,11 @@ GoodJob::Engine.routes.draw do
   get 'jobs/metrics/primary_nav', to: 'metrics#primary_nav', as: :metrics_primary_nav
   get 'jobs/metrics/job_status', to: 'metrics#job_status', as: :metrics_job_status
 
-  resources :batches, only: %i[index show]
+  resources :batches, only: %i[index show] do
+    member do
+      put :retry
+    end
+  end
 
   resources :cron_entries, only: %i[index show], param: :cron_key do
     member do
@@ -35,6 +39,6 @@ GoodJob::Engine.routes.draw do
 
   scope :frontend, controller: :frontends, defaults: { version: GoodJob::VERSION.tr(".", "-") } do
     get "modules/:version/:id", action: :module, as: :frontend_module, constraints: { format: 'js' }
-    get "static/:version/:id", action: :static, as: :frontend_static, constraints: { format: %w[css js svg] }
+    get "static/:version/:id", action: :static, as: :frontend_static
   end
 end

data/lib/good_job/active_job_extensions/concurrency.rb

@@ -149,8 +149,10 @@ module GoodJob
                                                      .order(Arel.sql("COALESCE(performed_at, scheduled_at, created_at) ASC"))
                                                      .limit(limit).pluck(:active_job_id)
                 # The current job has already been locked and will appear in the previous query
-                exceeded = :limit unless allowed_active_job_ids.include?(job.job_id)
-                next
+                unless allowed_active_job_ids.include?(job.job_id)
+                  exceeded = :limit
+                  next
+                end
               end
 
               if throttle
@@ -165,8 +167,10 @@ module GoodJob
                                               .limit(throttle_limit)
                                               .pluck(:active_job_id)
 
-                exceeded = :throttle unless allowed_active_job_ids.include?(job.job_id)
-                next
+                unless allowed_active_job_ids.include?(job.job_id)
+                  exceeded = :throttle
+                  next
+                end
               end
             end
 

data/lib/good_job/capsule_tracker.rb

@@ -57,7 +57,7 @@ module GoodJob # :nodoc:
         if @record
           @record.refresh_if_stale
         else
-          @record = GoodJob::Process.create_record(id: @record_id)
+          @record = GoodJob::Process.find_or_create_record(id: @record_id)
           create_refresh_task
         end
         value = @record&.id
@@ -89,7 +89,7 @@ module GoodJob # :nodoc:
               @advisory_locked_connection = WeakRef.new(@record.class.connection)
             end
           else
-            @record = GoodJob::Process.create_record(id: @record_id, with_advisory_lock: true)
+            @record = GoodJob::Process.find_or_create_record(id: @record_id, with_advisory_lock: true)
             @advisory_locked_connection = WeakRef.new(@record.class.connection)
             create_refresh_task
           end

data/lib/good_job/configuration.rb

@@ -35,8 +35,6 @@ module GoodJob
     DEFAULT_DASHBOARD_LIVE_POLL_ENABLED = true
     # Default enqueue_after_transaction_commit
     DEFAULT_ENQUEUE_AFTER_TRANSACTION_COMMIT = false
-    # Default smaller_number_is_higher_priority
-    DEFAULT_SMALLER_NUMBER_IS_HIGHER_PRIORITY = true
 
     def self.validate_execution_mode(execution_mode)
       raise ArgumentError, "GoodJob execution mode must be one of #{EXECUTION_MODES.join(', ')}. It was '#{execution_mode}' which is not valid." unless execution_mode.in?(EXECUTION_MODES)
@@ -347,12 +345,6 @@ module GoodJob
       DEFAULT_ENABLE_LISTEN_NOTIFY
     end
 
-    def smaller_number_is_higher_priority
-      return rails_config[:smaller_number_is_higher_priority] unless rails_config[:smaller_number_is_higher_priority].nil?
-
-      DEFAULT_SMALLER_NUMBER_IS_HIGHER_PRIORITY
-    end
-
     def dashboard_default_locale
       rails_config[:dashboard_default_locale] || DEFAULT_DASHBOARD_DEFAULT_LOCALE
     end
@@ -385,6 +377,16 @@ module GoodJob
       end || false
     end
 
+    # Whether to take an advisory lock on the process record in the notifier reactor.
+    # @return [Boolean]
+    def advisory_lock_heartbeat
+      return options[:advisory_lock_heartbeat] unless options[:advisory_lock_heartbeat].nil?
+      return rails_config[:advisory_lock_heartbeat] unless rails_config[:advisory_lock_heartbeat].nil?
+      return ActiveModel::Type::Boolean.new.cast(env['GOOD_JOB_ADVISORY_LOCK_HEARTBEAT']) unless env['GOOD_JOB_ADVISORY_LOCK_HEARTBEAT'].nil?
+
+      Rails.env.development?
+    end
+
     private
 
     def rails_config

data/lib/good_job/notifier/process_heartbeat.rb

@@ -14,9 +14,10 @@ module GoodJob # :nodoc:
 
       # Registers the current process.
       def register_process
+        @advisory_lock_heartbeat = GoodJob.configuration.advisory_lock_heartbeat
         GoodJob::Process.override_connection(connection) do
           GoodJob::Process.cleanup
-          @capsule.tracker.register(with_advisory_lock: true)
+          @capsule.tracker.register(with_advisory_lock: @advisory_lock_heartbeat)
         end
       end
 
@@ -33,7 +34,7 @@ module GoodJob # :nodoc:
       # Deregisters the current process.
       def deregister_process
         GoodJob::Process.override_connection(connection) do
-          @capsule.tracker.unregister(with_advisory_lock: true)
+          @capsule.tracker.unregister(with_advisory_lock: @advisory_lock_heartbeat)
         end
       end
     end

data/lib/good_job/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.2.0
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-31 00:00:00.000000000 Z
+date: 2024-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob