good_job 3.12.8 → 3.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92bd0503979e96fb9119be0be1afd74b7be8594a3c377026c06ea55dcb26a3ee
-  data.tar.gz: fedebf29ee5a4100414367687958e6c8cfcc1bce938618344466bf86e454aacc
+  metadata.gz: 1c0893de944702ad430a2ac00b8e47d740bad60a12a5ae4d009d7c0bcfbeefac
+  data.tar.gz: bdddfd0a48ba4c93c6a255f31a90eee482b1af65b6fd128973235370ab469c01
 SHA512:
-  metadata.gz: 3eb60ccb026da7584b87968cd89bf1df4fc763c208271d4cde46c3c831ac8887cec7eb10f607ebfb57d1c790ec0529683fb578f6bf094809d0fc43ebaf8c3c06
-  data.tar.gz: 425dd0a42e51c79710589948c0b99e9a148e31d524265772c4e931c9b610a7fa2bc0de0123ca8038afab42abf85e22f9083f76a151837608f0e07327aef8796a
+  metadata.gz: 3dc31d6cb250ad3fd6494718a282aea4982e0e47f3337d4b0601bb8e46bd958edf84ff6e28fa583c45b4071ca1fc68c0deee0f4a763fb98505ea2d4e65d3547e
+  data.tar.gz: 3937ac0c805118d9ed4c09c7dda525b5dd913190129c2f6bb3bbffe8cc9100716325374d004c86aa6cb623d84a3f5392acea19cbd1bcfbaf0c4585ed9adf7043

data/CHANGELOG.md

@@ -1,5 +1,36 @@
 # Changelog
 
+## [v3.14.0](https://github.com/bensheldon/good_job/tree/v3.14.0) (2023-03-09)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.13.0...v3.14.0)
+
+**Implemented enhancements:**
+
+- Deprecate definition of job priority, change to "smaller number is higher priority" to align with Active Job definition [\#883](https://github.com/bensheldon/good_job/pull/883) ([bensheldon](https://github.com/bensheldon))
+
+## [v3.13.0](https://github.com/bensheldon/good_job/tree/v3.13.0) (2023-03-08)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.12.8...v3.13.0)
+
+**Implemented enhancements:**
+
+- If logging to STDOUT in CLI set $stdout.sync = true [\#882](https://github.com/bensheldon/good_job/pull/882) ([blafri](https://github.com/blafri))
+
+**Fixed bugs:**
+
+- Don't load all Executions on Jobs Dashboard [\#878](https://github.com/bensheldon/good_job/pull/878) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- No route matches \[POST\] "/scheduler-dashboard/jobs/\<id\>/retry" [\#880](https://github.com/bensheldon/good_job/issues/880)
+- What is `concurrency_key` used for? [\#877](https://github.com/bensheldon/good_job/issues/877)
+- ArgumentError in GoodJob::Jobs\#index [\#875](https://github.com/bensheldon/good_job/issues/875)
+- Nonworking dashboard for job with many retries [\#809](https://github.com/bensheldon/good_job/issues/809)
+
+**Merged pull requests:**
+
+- Add aggressive test for async Batches [\#833](https://github.com/bensheldon/good_job/pull/833) ([bensheldon](https://github.com/bensheldon))
+
 ## [v3.12.8](https://github.com/bensheldon/good_job/tree/v3.12.8) (2023-03-06)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v3.12.7...v3.12.8)

data/app/filters/good_job/jobs_filter.rb

@@ -2,15 +2,17 @@
 module GoodJob
   class JobsFilter < BaseFilter
     def states
-      query = filtered_query(params.except(:state))
-      {
-        'scheduled' =>  query.scheduled.count,
-        'retried' => query.retried.count,
-        'queued' => query.queued.count,
-        'running' => query.running.count,
-        'succeeded' => query.succeeded.count,
-        'discarded' => query.discarded.count,
-      }
+      @_states ||= begin
+        query = filtered_query(params.except(:state))
+        {
+          'scheduled' =>  query.scheduled.count,
+          'retried' => query.retried.count,
+          'queued' => query.queued.count,
+          'running' => query.running.count,
+          'succeeded' => query.succeeded.count,
+          'discarded' => query.discarded.count,
+        }
+      end
     end
 
     def filtered_query(filter_params = params)
@@ -42,13 +44,13 @@ module GoodJob
     end
 
     def filtered_count
-      filtered_query.unscope(:select).count
+      @_filtered_count ||= filtered_query.unscope(:select).count
     end
 
     private
 
     def query_for_records
-      filtered_query.includes(:executions).includes_advisory_locks
+      filtered_query.includes_advisory_locks
     end
 
     def default_base_query

data/app/models/good_job/execution.rb

@@ -108,7 +108,13 @@ module GoodJob
     # @!method priority_ordered
     # @!scope class
     # @return [ActiveRecord::Relation]
-    scope :priority_ordered, -> { order('priority DESC NULLS LAST') }
+    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)
 
     # Order executions by created_at, for first-in first-out
     # @!method creation_ordered
@@ -206,6 +212,14 @@ module GoodJob
 
     # Construct a GoodJob::Execution from an ActiveJob instance.
     def self.build_for_enqueue(active_job, overrides = {})
+      if active_job.priority && GoodJob.configuration.smaller_number_is_higher_priority.nil?
+        ActiveSupport::Deprecation.warn(<<~DEPRECATION)
+          The next major version of GoodJob (v4.0) will change job `priority` to give smaller numbers higher priority (default: `0`), in accordance with Active Job's definition of priority.
+            To opt-in to this behavior now, set `config.good_job.smaller_number_is_higher_priority = true` in your GoodJob initializer or application.rb.
+            To not opt-in yet, but silence this deprecation warning, set `config.good_job.smaller_number_is_higher_priority = false`.
+        DEPRECATION
+      end
+
       execution_args = {
         active_job_id: active_job.job_id,
         queue_name: active_job.queue_name.presence || DEFAULT_QUEUE_NAME,

data/app/models/good_job/job.rb

@@ -136,6 +136,16 @@ module GoodJob
       error || executions[-2]&.error
     end
 
+    # Errors for the job to be displayed in the Dashboard.
+    # @return [String]
+    def display_error
+      return error if error.present?
+
+      serialized_params.fetch('exception_executions', {}).map do |exception, count|
+        "#{exception}: #{count}"
+      end.join(', ')
+    end
+
     # Return formatted serialized_params for display in the dashboard
     # @return [Hash]
     def display_serialized_params

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

@@ -82,7 +82,7 @@
                       bs_toggle: "popover",
                       bs_trigger: "hover focus click",
                       bs_placement: "bottom",
-                      bs_content: job.recent_error
+                      bs_content: job.display_error,
                 } %>
               <% else %>
                 <span class="badge bg-secondary bg-opacity-50 rounded-pill"><%= job.executions_count %></span>

data/lib/good_job/cli.rb

@@ -148,7 +148,10 @@ module GoodJob
       # Rails or from the application can be set up here.
       def set_up_application!
         require RAILS_ENVIRONMENT_RB
-        return if !GoodJob::CLI.log_to_stdout? || ActiveSupport::Logger.logger_outputs_to?(GoodJob.logger, $stdout)
+        return unless GoodJob::CLI.log_to_stdout?
+
+        $stdout.sync = true
+        return if ActiveSupport::Logger.logger_outputs_to?(GoodJob.logger, $stdout)
 
         GoodJob::LogSubscriber.loggers << ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new($stdout))
         GoodJob::LogSubscriber.reset_logger

data/lib/good_job/configuration.rb

@@ -341,6 +341,10 @@ module GoodJob
       DEFAULT_ENABLE_LISTEN_NOTIFY
     end
 
+    def smaller_number_is_higher_priority
+      rails_config[:smaller_number_is_higher_priority]
+    end
+
     private
 
     def rails_config

data/lib/good_job/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 3.12.8
+  version: 3.14.0
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-06 00:00:00.000000000 Z
+date: 2023-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob