good_job 4.0.0 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a4006c920a731f763e36a964e7eb161a292e8a4b34bffa4b60b95b75145c28c
-  data.tar.gz: f54b107db6ac1e2304a4ee9e2d34fa65032dc2b1ab0425e0be5ea42d39e5590b
+  metadata.gz: e2bd0a03d12095efe56c49c36fce5dbef909efbb4a984203c49b5ad2e0ba2fc5
+  data.tar.gz: 5bc6fc1c127bcffe8388b8f0994c3a2c82b31952387c6be67a35fc280bf1c4cd
 SHA512:
-  metadata.gz: 4474aaa0540dc5ff1bba65e8807a6fa69a9901f2e68051c57cf954e30270e9e6d7eaf52a3ce8ec7de6f48b16fc60fa05e796f595f14dfda41a76cbeb5b042543
-  data.tar.gz: cf8103c84fceffe91e4f7b0f5083c3989d2312a17ce96b1db01d7726a99b651c7d850f83fe23075c5a01628a825ef71d335d0eb42e91a478a62dd7772ee95e54
+  metadata.gz: 0a4c1d788d8c8ea031b4b4654b65b7fe170a0f24d1ffb2550a150de100c8c73f66a4b7d3b19bce99b7f752230c50c5b59829bd906cc3036759553b5615b1b451
+  data.tar.gz: 25b4458b92cbeca4db9f6486ee73e41f415b12ab585b35d7724f24e88f99e86b038be2e73f67b4e4bc6c60ff3d01df7903529ab9c859d3df9259db0a113460bc

data/CHANGELOG.md

@@ -1,5 +1,38 @@
 # Changelog
 
+## [v4.0.2](https://github.com/bensheldon/good_job/tree/v4.0.2) (2024-07-08)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v4.0.1...v4.0.2)
+
+**Fixed bugs:**
+
+- Fix a rails 6.1 deprecation warning for the duration attribute [\#1408](https://github.com/bensheldon/good_job/pull/1408) ([Earlopain](https://github.com/Earlopain))
+- Actually remove deprecated configuration for `cleanup_interval_seconds`, `cleanup_interval_jobs`; remove deprecated `Lockable` [\#1406](https://github.com/bensheldon/good_job/pull/1406) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- PG::UndefinedColumn: ERROR:  column good\_job\_processes.lock\_type does not exist [\#1405](https://github.com/bensheldon/good_job/issues/1405)
+- undefined method `duration=' for an instance of GoodJob::Execution [\#1404](https://github.com/bensheldon/good_job/issues/1404)
+- v3 deprecations are still present [\#1399](https://github.com/bensheldon/good_job/issues/1399)
+
+**Merged pull requests:**
+
+- Fix Batch integration test to not exhaust database connection thread pool [\#1409](https://github.com/bensheldon/good_job/pull/1409) ([bensheldon](https://github.com/bensheldon))
+- Discrete cleanup [\#1401](https://github.com/bensheldon/good_job/pull/1401) ([Earlopain](https://github.com/Earlopain))
+
+## [v4.0.1](https://github.com/bensheldon/good_job/tree/v4.0.1) (2024-07-08)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v4.0.0...v4.0.1)
+
+**Fixed bugs:**
+
+- Actually change `smaller_number_is_higher_priority` for v4 [\#1402](https://github.com/bensheldon/good_job/pull/1402) ([Earlopain](https://github.com/Earlopain))
+
+**Merged pull requests:**
+
+- Bump prism/rbi dev dependency [\#1403](https://github.com/bensheldon/good_job/pull/1403) ([Earlopain](https://github.com/Earlopain))
+- Use index action for the performance controller [\#1398](https://github.com/bensheldon/good_job/pull/1398) ([Earlopain](https://github.com/Earlopain))
+
 ## [v4.0.0](https://github.com/bensheldon/good_job/tree/v4.0.0) (2024-07-07)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v3.99.0...v4.0.0)

data/app/controllers/good_job/{performances_controller.rb → performance_controller.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module GoodJob
-  class PerformancesController < ApplicationController
-    def show
+  class PerformanceController < ApplicationController
+    def index
       @performances = GoodJob::DiscreteExecution
                       .where.not(job_class: nil)
                       .group(:job_class)

data/app/models/good_job/base_execution.rb

@@ -25,6 +25,8 @@ module GoodJob
     self.advisory_lockable_column = 'active_job_id'
     self.implicit_order_column = 'created_at'
 
+    self.ignored_columns += ["is_discrete"]
+
     define_model_callbacks :perform
     define_model_callbacks :perform_unlocked, only: :after
 
@@ -216,14 +218,6 @@ module GoodJob
       def coalesce_scheduled_at_created_at
         arel_table.coalesce(arel_table['scheduled_at'], arel_table['created_at'])
       end
-
-      def discrete_support?
-        true
-      end
-    end
-
-    def discrete?
-      is_discrete?
     end
 
     # Build an ActiveJob instance and deserialize the arguments, using `#active_job_data`.
@@ -545,17 +539,6 @@ module GoodJob
       false
     end
 
-    def make_discrete
-      self.is_discrete = true
-      self.id = active_job_id
-      self.job_class = serialized_params['job_class']
-      self.executions_count ||= 0
-
-      current_time = Time.current
-      self.created_at ||= current_time
-      self.scheduled_at ||= current_time
-    end
-
     # Return formatted serialized_params for display in the dashboard
     # @return [Hash]
     def display_serialized_params

data/app/models/good_job/discrete_execution.rb

@@ -14,6 +14,9 @@ module GoodJob # :nodoc:
 
     alias_attribute :performed_at, :created_at
 
+    # TODO: Remove when support for Rails 6.1 is dropped
+    attribute :duration, :interval
+
     def number
       serialized_params.fetch('executions', 0) + 1
     end

data/app/models/good_job/job.rb

@@ -46,8 +46,6 @@ module GoodJob
     # Errored but will not be retried
     scope :discarded, -> { finished.where.not(error: nil) }
 
-    scope :unfinished_undiscrete, -> { where(finished_at: nil, retried_good_job_id: nil, is_discrete: [nil, false]) }
-
     # TODO: it would be nice to enforce these values at the model
     # validates :active_job_id, presence: true
     # validates :scheduled_at, presence: true

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

@@ -40,8 +40,8 @@
           <% end %>
         </li>
         <li class="nav-item">
-          <%= link_to performance_path, class: ["nav-link", ("active" if controller_name == 'performances')] do %>
-            <%= t(".performances") %>
+          <%= link_to performance_index_path, class: ["nav-link", ("active" if controller_name == 'performance')] do %>
+            <%= t(".performance") %>
           <% end %>
         </li>
       </ul>

data/config/locales/de.yml

@@ -194,8 +194,8 @@ de:
             thousand: K
             trillion: T
             unit: ''
-    performances:
-      show:
+    performance:
+      index:
         average_duration: Durchschnittliche Dauer
         executions: Hinrichtungen
         job_class: Berufsklasse
@@ -231,7 +231,7 @@ de:
         jobs: Jobs
         live_poll: Live Poll
         name: "GoodJob 👍"
-        performances: Leistung
+        performance: Leistung
         processes: Prozesse
         theme:
           auto: Auto

data/config/locales/en.yml

@@ -194,8 +194,8 @@ en:
             thousand: K
             trillion: T
             unit: ''
-    performances:
-      show:
+    performance:
+      index:
         average_duration: Average duration
         executions: Executions
         job_class: Job class
@@ -231,7 +231,7 @@ en:
         jobs: Jobs
         live_poll: Live Poll
         name: "GoodJob 👍"
-        performances: Performance
+        performance: Performance
         processes: Processes
         theme:
           auto: Auto

data/config/locales/es.yml

@@ -194,8 +194,8 @@ es:
             thousand: k
             trillion: T
             unit: ''
-    performances:
-      show:
+    performance:
+      index:
         average_duration: Duración promedio
         executions: Ejecuciones
         job_class: clase de trabajo
@@ -231,7 +231,7 @@ es:
         jobs: Tareas
         live_poll: En vivo
         name: "GoodJob 👍"
-        performances: Actuación
+        performance: Actuación
         processes: Procesos
         theme:
           auto: Auto

data/config/locales/fr.yml

@@ -194,8 +194,8 @@ fr:
             thousand: k
             trillion: J
             unit: ''
-    performances:
-      show:
+    performance:
+      index:
         average_duration: Durée moyenne
         executions: Exécutions
         job_class: Catégorie d'emplois
@@ -231,7 +231,7 @@ fr:
         jobs: Jobs
         live_poll: En direct
         name: "GoodJob 👍"
-        performances: Performance
+        performance: Performance
         processes: Processus
         theme:
           auto: Auto

data/config/locales/it.yml

@@ -194,8 +194,8 @@ it:
             thousand: K
             trillion: T
             unit: ''
-    performances:
-      show:
+    performance:
+      index:
         average_duration: Durata media
         executions: Esecuzioni
         job_class: Classe di lavoro
@@ -231,7 +231,7 @@ it:
         jobs: Job
         live_poll: Live Poll
         name: "GoodJob 👍"
-        performances: Prestazione
+        performance: Prestazione
         processes: Processi
         theme:
           auto: Auto

data/config/locales/ja.yml

@@ -194,8 +194,8 @@ ja:
             thousand: K
             trillion: T
             unit: ''
-    performances:
-      show:
+    performance:
+      index:
         average_duration: 平均所要時間
         executions: 処刑
         job_class: 職種
@@ -231,7 +231,7 @@ ja:
         jobs: ジョブ
         live_poll: リアルタイム更新
         name: "GoodJob 👍"
-        performances: パフォーマンス
+        performance: パフォーマンス
         processes: プロセス
         theme:
           auto: 自動

data/config/locales/ko.yml

@@ -194,8 +194,8 @@ ko:
             thousand: K
             trillion: T
             unit: ''
-    performances:
-      show:
+    performance:
+      index:
         average_duration: 평균 지속 시간
         executions: 처형
         job_class: 직업군
@@ -231,7 +231,7 @@ ko:
         jobs: 작업
         live_poll: 실시간 업데이트
         name: "GoodJob 👍"
-        performances: 성능
+        performance: 성능
         processes: 프로세스
         theme:
           auto: 자동

data/config/locales/nl.yml

@@ -194,8 +194,8 @@ nl:
             thousand: K
             trillion: T
             unit: ''
-    performances:
-      show:
+    performance:
+      index:
         average_duration: Gemiddelde duur
         executions: Executies
         job_class: Functie klasse
@@ -231,7 +231,7 @@ nl:
         jobs: Taken
         live_poll: Live Poll
         name: "GoodJob 👍"
-        performances: Prestatie
+        performance: Prestatie
         processes: Processen
         theme:
           auto: Auto

data/config/locales/pt-BR.yml

@@ -194,8 +194,8 @@ pt-BR:
             thousand: K
             trillion: T
             unit: ''
-    performances:
-      show:
+    performance:
+      index:
         average_duration: Duração média
         executions: Execuções
         job_class: Classe de trabalho
@@ -231,7 +231,7 @@ pt-BR:
         jobs: Tarefas
         live_poll: Acompanhamento ao Vivo
         name: "GoodJob 👍"
-        performances: Desempenho
+        performance: Desempenho
         processes: Processos
         theme:
           auto: Automático

data/config/locales/ru.yml

@@ -220,8 +220,8 @@ ru:
             thousand: К
             trillion: Т
             unit: ''
-    performances:
-      show:
+    performance:
+      index:
         average_duration: Средняя продолжительность
         executions: Казни
         job_class: Класс работы
@@ -257,7 +257,7 @@ ru:
         jobs: Задания
         live_poll: Обновления в реальном времени
         name: "GoodJob 👍"
-        performances: Производительность
+        performance: Производительность
         processes: Процессы
         theme:
           auto: Авто

data/config/locales/tr.yml

@@ -194,8 +194,8 @@ tr:
             thousand: Bin
             trillion: Trilyon
             unit: ''
-    performances:
-      show:
+    performance:
+      index:
         average_duration: Ortalama süre
         executions: İnfazlar
         job_class: İş sınıfı
@@ -231,7 +231,7 @@ tr:
         jobs: İşler
         live_poll: Anlık Güncelleme
         name: "GoodJob 👍"
-        performances: Verim
+        performance: Verim
         processes: Süreçler
         theme:
           auto: Oto

data/config/locales/uk.yml

@@ -220,8 +220,8 @@ uk:
             thousand: Тис
             trillion: Трлн
             unit: ''
-    performances:
-      show:
+    performance:
+      index:
         average_duration: Середня тривалість
         executions: Страти
         job_class: Клас роботи
@@ -257,7 +257,7 @@ uk:
         jobs: Задачі
         live_poll: Живе Опитування
         name: "GoodJob 👍"
-        performances: Продуктивність
+        performance: Продуктивність
         processes: Процеси
         theme:
           auto: Авто

data/config/routes.rb

@@ -31,7 +31,7 @@ GoodJob::Engine.routes.draw do
 
   resources :processes, only: %i[index]
 
-  resource :performance, only: %i[show]
+  resources :performance, only: %i[index]
 
   scope :frontend, controller: :frontends do
     get "modules/:name", action: :module, as: :frontend_module, constraints: { format: 'js' }

data/lib/good_job/cleanup_tracker.rb

@@ -9,7 +9,7 @@ module GoodJob # :nodoc:
                   :last_at
 
     def initialize(cleanup_interval_seconds: false, cleanup_interval_jobs: false)
-      raise ArgumentError, "Do not use `0`. Use `false` to disable, or -1 to always run" if cleanup_interval_seconds == 0 || cleanup_interval_jobs == 0 # rubocop:disable Style/NumericPredicate
+      raise ArgumentError, "Do not use `0` for cleanup intervals. Use `false` to disable, or -1 to always run" if cleanup_interval_seconds == 0 || cleanup_interval_jobs == 0 # rubocop:disable Style/NumericPredicate
 
       self.cleanup_interval_seconds = cleanup_interval_seconds
       self.cleanup_interval_jobs = cleanup_interval_jobs

data/lib/good_job/configuration.rb

@@ -35,6 +35,8 @@ 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)
@@ -228,8 +230,8 @@ module GoodJob
     def queue_select_limit
       (
         options[:queue_select_limit] ||
-        rails_config[:queue_select_limit] ||
-        env['GOOD_JOB_QUEUE_SELECT_LIMIT']
+          rails_config[:queue_select_limit] ||
+          env['GOOD_JOB_QUEUE_SELECT_LIMIT']
       )&.to_i
     end
 
@@ -238,8 +240,8 @@ module GoodJob
     def idle_timeout
       (
         options[:idle_timeout] ||
-        rails_config[:idle_timeout] ||
-        env['GOOD_JOB_IDLE_TIMEOUT']
+          rails_config[:idle_timeout] ||
+          env['GOOD_JOB_IDLE_TIMEOUT']
       )&.to_i || nil
     end
 
@@ -267,69 +269,38 @@ module GoodJob
     # Positive values will clean up after that many jobs have run, false or 0 will disable, and -1 will clean up after every job.
     # @return [Integer, Boolean, nil]
     def cleanup_interval_jobs
-      if rails_config.key?(:cleanup_interval_jobs)
-        value = rails_config[:cleanup_interval_jobs]
-        if value.nil?
-          GoodJob.deprecator.warn(
-            %(Setting `config.good_job.cleanup_interval_jobs` to `nil` will no longer disable count-based cleanups in GoodJob v4. Set to `false` to disable, or `-1` to run every time.)
-          )
-          value = false
-        elsif value == 0 # rubocop:disable Style/NumericPredicate
-          GoodJob.deprecator.warn(
-            %(Setting `config.good_job.cleanup_interval_jobs` to `0` will disable count-based cleanups in GoodJob v4. Set to `false` to disable, or `-1` to run every time.)
-          )
-          value = -1
-        end
-      elsif env.key?('GOOD_JOB_CLEANUP_INTERVAL_JOBS')
-        value = env['GOOD_JOB_CLEANUP_INTERVAL_JOBS']
-        if value.blank?
-          GoodJob.deprecator.warn(
-            %(Setting `GOOD_JOB_CLEANUP_INTERVAL_JOBS` to `""` will no longer disable count-based cleanups in GoodJob v4. Set to `0` to disable, or `-1` to run every time.)
-          )
-          value = false
-        elsif value == '0'
-          value = false
-        end
+      value = if rails_config.key?(:cleanup_interval_jobs)
+                rails_config[:cleanup_interval_jobs]
+              elsif env.key?('GOOD_JOB_CLEANUP_INTERVAL_JOBS')
+                env['GOOD_JOB_CLEANUP_INTERVAL_JOBS']
+              end
+
+      if value.in? [nil, "", true]
+        DEFAULT_CLEANUP_INTERVAL_JOBS
+      elsif value.in? [0, "0", false, "false"]
+        false
       else
-        value = DEFAULT_CLEANUP_INTERVAL_JOBS
+        value ? value.to_i : false
       end
-
-      value ? value.to_i : false
     end
 
     # Number of seconds a {Scheduler} will wait before automatically cleaning up preserved jobs.
     # Positive values will clean up after that many jobs have run, false or 0 will disable, and -1 will clean up after every job.
-    # @return [Integer, nil]
+    # @return [Integer, Boolean, nil]
     def cleanup_interval_seconds
-      if rails_config.key?(:cleanup_interval_seconds)
-        value = rails_config[:cleanup_interval_seconds]
-
-        if value.nil?
-          GoodJob.deprecator.warn(
-            %(Setting `config.good_job.cleanup_interval_seconds` to `nil` will no longer disable time-based cleanups in GoodJob v4. Set to `false` to disable, or `-1` to run every time.)
-          )
-          value = false
-        elsif value == 0 # rubocop:disable Style/NumericPredicate
-          GoodJob.deprecator.warn(
-            %(Setting `config.good_job.cleanup_interval_seconds` to `0` will disable time-based cleanups in GoodJob v4. Set to `false` to disable, or `-1` to run every time.)
-          )
-          value = -1
-        end
-      elsif env.key?('GOOD_JOB_CLEANUP_INTERVAL_SECONDS')
-        value = env['GOOD_JOB_CLEANUP_INTERVAL_SECONDS']
-        if value.blank?
-          GoodJob.deprecator.warn(
-            %(Setting `GOOD_JOB_CLEANUP_INTERVAL_SECONDS` to `""` will no longer disable time-based cleanups in GoodJob v4. Set to `0` to disable, or `-1` to run every time.)
-          )
-          value = false
-        elsif value == '0'
-          value = false
-        end
+      value = if rails_config.key?(:cleanup_interval_seconds)
+                rails_config[:cleanup_interval_seconds]
+              elsif env.key?('GOOD_JOB_CLEANUP_INTERVAL_SECONDS')
+                env['GOOD_JOB_CLEANUP_INTERVAL_SECONDS']
+              end
+
+      if value.nil? || value == "" || value == true
+        DEFAULT_CLEANUP_INTERVAL_SECONDS
+      elsif value.in? [0, "0", false, "false"]
+        false
       else
-        value = DEFAULT_CLEANUP_INTERVAL_SECONDS
+        value ? value.to_i : false
       end
-
-      value ? value.to_i : false
     end
 
     # Tests whether to daemonize the process.
@@ -378,7 +349,9 @@ module GoodJob
     end
 
     def smaller_number_is_higher_priority
-      rails_config[: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

data/lib/good_job/version.rb

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

data/lib/good_job.rb

@@ -269,7 +269,11 @@ module GoodJob
   # Tests whether GoodJob can be safely upgraded to v4
   # @return [Boolean]
   def self.v4_ready?
-    GoodJob::Job.discrete_support? && GoodJob::Job.where(finished_at: nil).where(is_discrete: [nil, false]).none?
+    GoodJob.deprecator.warn(<<~MSG)
+      Calling `GoodJob.v4_ready?` is deprecated and will be removed in GoodJob v5.
+      If you are reading this deprecation you are already on v4.
+    MSG
+    true
   end
 
   # Deprecator for providing deprecation warnings.
@@ -281,9 +285,6 @@ module GoodJob
     end
   end
 
-  include ActiveSupport::Deprecation::DeprecatedConstantAccessor
-  deprecate_constant :Lockable, 'GoodJob::AdvisoryLockable', deprecator: deprecator
-
   # Whether all GoodJob migrations have been applied.
   # For use in tests/CI to validate GoodJob is up-to-date.
   # @return [Boolean]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.2
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-07 00:00:00.000000000 Z
+date: 2024-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -255,7 +255,7 @@ files:
 - app/controllers/good_job/frontends_controller.rb
 - app/controllers/good_job/jobs_controller.rb
 - app/controllers/good_job/metrics_controller.rb
-- app/controllers/good_job/performances_controller.rb
+- app/controllers/good_job/performance_controller.rb
 - app/controllers/good_job/processes_controller.rb
 - app/filters/good_job/base_filter.rb
 - app/filters/good_job/batches_filter.rb
@@ -307,7 +307,7 @@ files:
 - app/views/good_job/jobs/_table.erb
 - app/views/good_job/jobs/index.html.erb
 - app/views/good_job/jobs/show.html.erb
-- app/views/good_job/performances/show.html.erb
+- app/views/good_job/performance/index.html.erb
 - app/views/good_job/processes/index.html.erb
 - app/views/good_job/shared/_alert.erb
 - app/views/good_job/shared/_chart.erb