Skip to content

Commit c653e26

Browse files
authored
Merge pull request rails#52484 from excid3/fix-enqueue-after-transaction-commit-initializer
Delay enqueue_after_transaction_commit config until ActiveJob loaded
2 parents 2c8a5ab + 0c9be6c commit c653e26

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

activejob/lib/active_job/railtie.rb

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,12 @@ class Railtie < Rails::Railtie # :nodoc:
2626
end
2727

2828
initializer "active_job.enqueue_after_transaction_commit" do |app|
29-
if config.active_job.key?(:enqueue_after_transaction_commit)
30-
enqueue_after_transaction_commit = config.active_job.delete(:enqueue_after_transaction_commit)
29+
ActiveSupport.on_load(:active_record) do
30+
ActiveSupport.on_load(:active_job) do
31+
include EnqueueAfterTransactionCommit
3132

32-
ActiveSupport.on_load(:active_record) do
33-
ActiveSupport.on_load(:active_job) do
34-
include EnqueueAfterTransactionCommit
35-
36-
ActiveJob::Base.enqueue_after_transaction_commit = enqueue_after_transaction_commit
33+
if app.config.active_job.key?(:enqueue_after_transaction_commit)
34+
ActiveJob::Base.enqueue_after_transaction_commit = app.config.active_job.delete(:enqueue_after_transaction_commit)
3735
end
3836
end
3937
end

0 commit comments

Comments
 (0)