good_job 3.27.0 → 3.27.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b3817133850acc5176086af47b774bcb80a6ead4ee11e1121a10b23b5c7adb0
-  data.tar.gz: 0d8d3412835f37b23122a821d7f1ea1f20120a1e1893d29fadcd6e6b8697bce5
+  metadata.gz: 6f6e4655250d166696f48733e756d69164f1c1b6371d925fa5333fd538c7850c
+  data.tar.gz: c65cd8ace06f23e8647ff6747eb754151a39a732a7ac9cb79534573016f20b87
 SHA512:
-  metadata.gz: 984697d136c831db59efdd76f8ca3fc820263de06bdcfe7650f685d75ee0ef64cc3e4c39aa2919b84273b15bb15689bc1fb47afce99a597035266c70372a7c65
-  data.tar.gz: f6f5942330d621fd89cc951a0f6731aa87578725f5959c9dfcf13c99252952e9c610385afcb03cc17a8bdeeb6a126d607e18c910b66353c01c941eb8e0a6c515
+  metadata.gz: 1bb8b51381b2e61dcb024d15fd555f2cc36a5dbd1abb0439b20e8db182c332f136be433108a07cc0fdfcc7a2321035f1136676833a81387783694db5a9c6ea32
+  data.tar.gz: 1054014eb0dea19141fde93ef3a99b6533804f9f5714a97be43bb9bf57183297371df458f7ac55c0c77fd3bf7d8504d49c980d9ed5f5b94f378f1468356d6c68

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [v3.27.1](https://github.com/bensheldon/good_job/tree/v3.27.1) (2024-03-24)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.27.0...v3.27.1)
+
+**Fixed bugs:**
+
+- Start async adapters `after_initialize` instead of once Active Job and Active Record are loaded and Rails initialized? [\#1297](https://github.com/bensheldon/good_job/pull/1297) ([bensheldon](https://github.com/bensheldon))
+
 ## [v3.27.0](https://github.com/bensheldon/good_job/tree/v3.27.0) (2024-03-24)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v3.26.2...v3.27.0)

data/lib/good_job/adapter.rb

@@ -30,7 +30,7 @@ module GoodJob
       GoodJob::Configuration.validate_execution_mode(@_execution_mode_override) if @_execution_mode_override
       @capsule = _capsule
 
-      start_async if GoodJob.async_ready?
+      start_async if GoodJob._async_ready?
       self.class.instances << self
     end
 

data/lib/good_job/engine.rb

@@ -49,22 +49,17 @@ module GoodJob
     end
 
     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 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
-          ActiveSupport.on_load(:active_job) do
-            GoodJob._framework_ready = true
-            GoodJob._start_async_adapters
-          end
-          GoodJob._start_async_adapters
-        end
-        GoodJob._start_async_adapters
+        GoodJob._async_ready = true
+
+        # Ensure Active Record and Active Job are fully loaded
+        ActiveRecord::Base # rubocop:disable Lint/Void
+        ActiveJob::Base.queue_adapter
+
+        GoodJob::Adapter.instances
+                        .select(&:execute_async?)
+                        .reject(&:async_started?)
+                        .each(&:start_async)
       end
     end
   end

data/lib/good_job/version.rb

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

data/lib/good_job.rb

@@ -25,7 +25,6 @@ require_relative "good_job/configuration"
 require_relative "good_job/cron_manager"
 require_relative "good_job/current_thread"
 require_relative "good_job/daemon"
-require_relative "good_job/dependencies"
 require_relative "good_job/job_performer"
 require_relative "good_job/job_performer/metrics"
 require_relative "good_job/log_subscriber"
@@ -46,7 +45,6 @@ require_relative "good_job/thread_status"
 #
 # +GoodJob+ is the top-level namespace and exposes configuration attributes.
 module GoodJob
-  include GoodJob::Dependencies
   include GoodJob::ThreadStatus
 
   # Default, null, blank value placeholder.
@@ -114,6 +112,11 @@ module GoodJob
   #   @return [GoodJob::Capsule, nil]
   mattr_accessor :capsule, default: GoodJob::Capsule.new(configuration: configuration)
 
+  mattr_accessor :_async_ready, default: false
+  def self._async_ready?
+    _async_ready
+  end
+
   # Called with exception when a GoodJob thread raises an exception
   # @param exception [Exception] Exception that was raised
   # @return [void]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 3.27.0
+  version: 3.27.1
 platform: ruby
 authors:
 - Ben Sheldon
@@ -404,7 +404,6 @@ files:
 - lib/good_job/cron_manager.rb
 - lib/good_job/current_thread.rb
 - lib/good_job/daemon.rb
-- lib/good_job/dependencies.rb
 - lib/good_job/engine.rb
 - lib/good_job/interrupt_error.rb
 - lib/good_job/job_performer.rb

data/lib/good_job/dependencies.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module GoodJob # :nodoc:
-  # Extends GoodJob module to track Rails boot dependencies.
-  module Dependencies
-    extend ActiveSupport::Concern
-
-    included do
-      mattr_accessor :_framework_ready, default: false
-    end
-
-    class_methods do
-      # Whether Rails framework has sufficiently initialized to enable Async execution.
-      def async_ready?
-        Rails.application.initialized? || _framework_ready
-      end
-
-      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?)
-                        .each(&:start_async)
-      end
-    end
-  end
-end