good_job 3.12.7 → 3.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24b3e7de3de7bb0365a230607a0f1f566d431adcd508ce7ee23406164c6528bc
-  data.tar.gz: cd84291baf21cbaabbc543510851481ee835278bd1e844380be99fff749e0702
+  metadata.gz: c83cf253d12daeb00363fe9c1b3a06b463c6944aa108aa4f884bf43b0d1f5c88
+  data.tar.gz: 71738f01485fb73b1dfa71396807f4570922d53aa186bf7aa1f9c27b21e4e559
 SHA512:
-  metadata.gz: d79680539f1dfabf4076e313207a54b3f38370f31ca855fdc3cf5bfc20799dd2e6b2495274055a45027459f31439dd11677f270ef823ec6c64b8f44359691312
-  data.tar.gz: 1606e6811d188bd18d56d368fe712871193283c93f3f52c5300052884e4ca1fbb3e8ab502499add0b9364780eca13154ca9cb6c2bfdc8674ca3dd6b157f28209
+  metadata.gz: 25bbd078a94d5079b47d57c267ad72f7e6baa024230add7fd9c693c621eb8be7117aa517f715baba5b16cb5f0378eb0e407a41ea1569e923a16716ef0f4d391b
+  data.tar.gz: cf58cbaea01a1dd6714b53c6d618661908ccf46ef3deae58b3e2d6063f512e528d0d4f04850e7a3c4a1ccc59ece959a0919d19898488116898f78b9c78c7a5f6

data/CHANGELOG.md

@@ -1,17 +1,52 @@
 # Changelog
 
-## [v3.12.7](https://github.com/bensheldon/good_job/tree/v3.12.7) (2023-03-01)
+## [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.6...v3.12.7)
+[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:**
 
-- Rename "assets" to "frontends" to avoid Asset Pipeline collisions [\#874](https://github.com/bensheldon/good_job/pull/874) ([bensheldon](https://github.com/bensheldon))
+- 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)
+
+**Fixed bugs:**
+
+- Add `raise: false` to FrontendsController after action skip [\#881](https://github.com/bensheldon/good_job/pull/881) ([simi](https://github.com/simi))
 
 **Closed issues:**
 
 - GoodJob's JavaScript takes precedence over application's JavaScript in GoodJob 3.12.6, Rails 7 [\#873](https://github.com/bensheldon/good_job/issues/873)
 
+**Merged pull requests:**
+
+- Rewrite flaky tests: don't allow nil timeout for restart [\#872](https://github.com/bensheldon/good_job/pull/872) ([bensheldon](https://github.com/bensheldon))
+
+## [v3.12.7](https://github.com/bensheldon/good_job/tree/v3.12.7) (2023-03-01)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.12.6...v3.12.7)
+
+**Fixed bugs:**
+
+- Rename "assets" to "frontends" to avoid Asset Pipeline collisions [\#874](https://github.com/bensheldon/good_job/pull/874) ([bensheldon](https://github.com/bensheldon))
+
 ## [v3.12.6](https://github.com/bensheldon/good_job/tree/v3.12.6) (2023-03-01)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v3.12.5...v3.12.6)
@@ -158,7 +193,7 @@
 
 **Closed issues:**
 
-- Support for Ruby 3.2 [\#785](https://github.com/bensheldon/good_job/issues/785)
+- Support for Rails 6.1 / Ruby 3.2 [\#785](https://github.com/bensheldon/good_job/issues/785)
 - Custom table names [\#748](https://github.com/bensheldon/good_job/issues/748)
 - Health check issue with cron scheduler job [\#741](https://github.com/bensheldon/good_job/issues/741)
 

data/app/controllers/good_job/frontends_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module GoodJob
   class FrontendsController < ActionController::Base # rubocop:disable Rails/ApplicationController
-    skip_after_action :verify_same_origin_request
+    skip_after_action :verify_same_origin_request, raise: false
 
     STATIC_ASSETS = {
       css: {

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

@@ -55,9 +55,11 @@ module GoodJob
     end
 
     # Shutdown and then start the capsule again.
-    # @param timeout [nil, Numeric, Symbol] Seconds to wait for active threads.
+    # @param timeout [Numeric, Symbol] Seconds to wait for active threads.
     # @return [void]
     def restart(timeout: :default)
+      raise ArgumentError, "Capsule#restart cannot be called with a timeout of nil" if timeout.nil?
+
       shutdown(timeout: timeout)
       start
     end

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

@@ -132,11 +132,13 @@ module GoodJob # :nodoc:
 
     # Restart the Scheduler.
     # When shutdown, start; or shutdown and start.
-    # @param timeout [nil, Numeric] Seconds to wait for actively executing jobs to finish; shares same values as {#shutdown}.
+    # @param timeout [Numeric] Seconds to wait for actively executing jobs to finish; shares same values as {#shutdown}.
     # @return [void]
     def restart(timeout: -1)
+      raise ArgumentError, "Scheduler#restart cannot be called with a timeout of nil" if timeout.nil?
+
       instrument("scheduler_restart_pools") do
-        shutdown(timeout: timeout) if running?
+        shutdown(timeout: timeout)
         create_executor
         warm_cache
       end

data/lib/good_job/version.rb

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

data/lib/good_job.rb

@@ -131,7 +131,7 @@ module GoodJob
   # When forking processes you should shut down these background threads before forking, and restart them after forking.
   # For example, you should use +shutdown+ and +restart+ when using async execution mode with Puma.
   # See the {file:README.md#executing-jobs-async--in-process} for more explanation and examples.
-  # @param timeout [Numeric, nil] Seconds to wait for active threads to finish.
+  # @param timeout [Numeric] Seconds to wait for active threads to finish.
   # @return [void]
   def self.restart(timeout: -1)
     _shutdown_all(Capsule.instances, :restart, timeout: timeout)

metadata

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