good_job 3.15.2 → 3.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4674d611fd466270ee2bb79b4763848bced81ed16ae227dc05e0daca00b5672e
-  data.tar.gz: 40dda31aa1e21e6b16e4f2582354d572af271ebe270b80e6cbfceec95873f5da
+  metadata.gz: 85c6903e5f8838cb72f4687e364fa20cf9c461f0c4b79412bb8b61549bbf6333
+  data.tar.gz: d00fecc5a4fe561bc1a7f21a79e46245cb5ab603fafbbb4369344395c9c0fac0
 SHA512:
-  metadata.gz: 73ae44f8b88e70d4cfd98473920af572320157432f121b437f99718ca2182fa88d98b7f3dd4a3aec0319b6f2ddd51eb5eed1fe0290f94b605a4b9b7fedf53cc6
-  data.tar.gz: 932c23ebe5722a3a8d7638db77bfeefd350c219a071b8b96982cd19ad78319c2ddd3f7b178d3ebb59b7d670caf7b265c01b254c2481d13a7a6f0521f0d172c82
+  metadata.gz: a1116f1e94e07b62bc316a3ec76a1b0768d22b5a511a65cf18e40bc13d4e8c25290c7c879d5cdfea1f1a988e3809b130462b57bd25a7c2405b0152cbe9434f51
+  data.tar.gz: 227c89386f14a783260fff68c55f0f4b0d10db331ab705b922f02fdce79a8ec4cf0f969e554f02e55f030dbcda6efbd9439bcaafd7bc471028c35375a7b58ccf

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [v3.15.3](https://github.com/bensheldon/good_job/tree/v3.15.3) (2023-04-22)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.15.2...v3.15.3)
+
+**Merged pull requests:**
+
+- Eagerly autoload `ActiveJob::Base`; clean up framework deferred-loading logic to use nested `on_load` blocks [\#931](https://github.com/bensheldon/good_job/pull/931) ([bensheldon](https://github.com/bensheldon))
+
 ## [v3.15.2](https://github.com/bensheldon/good_job/tree/v3.15.2) (2023-04-19)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v3.15.1...v3.15.2)

data/lib/good_job/dependencies.rb

@@ -6,40 +6,19 @@ module GoodJob # :nodoc:
     extend ActiveSupport::Concern
 
     included do
-      # @!attribute [rw] _rails_after_initialize_hook_called
-      #   @!scope class
-      #   Whether Railtie.after_initialize has been called yet (default: +false+).
-      #   This will be set on  but before +Rails.application.initialize?+ is +true+.
-      #   @return [Boolean]
-      mattr_accessor :_rails_after_initialize_hook_called, default: false
-
-      # @!attribute [rw] _active_job_loaded
-      #   @!scope class
-      #   Whether ActiveJob has loaded (default: +false+).
-      #   @return [Boolean]
-      mattr_accessor :_active_job_loaded, default: false
-
-      # @!attribute [rw] _active_record_loaded
-      #   @!scope class
-      #   Whether ActiveRecord has loaded (default: +false+).
-      #   @return [Boolean]
-      mattr_accessor :_active_record_loaded, default: false
+      mattr_accessor :_framework_ready, default: false
     end
 
     class_methods do
-      # Whether GoodJob's  has been initialized as of the calling of +Railtie.after_initialize+.
-      # @return [Boolean]
+      # Whether Rails framework has sufficiently initialized to enable Async execution.
       def async_ready?
-        Rails.application.initialized? || (
-           _rails_after_initialize_hook_called &&
-           _active_job_loaded &&
-           _active_record_loaded
-         )
+        Rails.application.initialized? || _framework_ready
       end
 
-      def start_async_adapters
+      def _start_async_adapters
         return unless async_ready?
 
+        ActiveJob::Base.queue_adapter # Ensure Active Job is initialized
         GoodJob::Adapter.instances
                         .select(&:execute_async?)
                         .reject(&:async_started?)

data/lib/good_job/engine.rb

@@ -37,26 +37,21 @@ module GoodJob
 
     initializer "good_job.start_async" do
       # This hooks into the hookable places during Rails boot, which is unfortunately not Rails.application.initialized?
-      # If an Adapter is initialized during boot, we want to want to start its async executors once the framework dependencies have loaded.
+      # If an Adapter is initialized during boot, we want to want to start async executors once the framework dependencies have loaded.
       # When exactly that happens is out of our control because gems or application code may touch things earlier than expected.
       # For example, as of Rails 6.1, if an ActiveRecord model is touched during boot, that triggers ActiveRecord to load,
       # which touches DestroyAssociationAsyncJob, which loads ActiveJob, which may initialize a GoodJob::Adapter, all of which
       # happens _before_ ActiveRecord finishes loading. GoodJob will deadlock if an async executor is started in the middle of
       # ActiveRecord loading.
-
       config.after_initialize do
         ActiveSupport.on_load(:active_record) do
-          GoodJob._active_record_loaded = true
-          GoodJob.start_async_adapters
-        end
-
-        ActiveSupport.on_load(:active_job) do
-          GoodJob._active_job_loaded = true
-          GoodJob.start_async_adapters
+          ActiveSupport.on_load(:active_job) do
+            GoodJob._framework_ready = true
+            GoodJob._start_async_adapters
+          end
+          GoodJob._start_async_adapters
         end
-
-        GoodJob._rails_after_initialize_hook_called = true
-        GoodJob.start_async_adapters
+        GoodJob._start_async_adapters
       end
     end
   end

data/lib/good_job/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 3.15.2
+  version: 3.15.3
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-19 00:00:00.000000000 Z
+date: 2023-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -461,7 +461,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A multithreaded, Postgres-based ActiveJob backend for Ruby on Rails