Browse Source

Mailer.with_synched_deliveries doesn't correctly detect other async Queue adapters (#36393).

Patch by Felix Schäfer.


git-svn-id: http://svn.redmine.org/redmine/trunk@21362 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/5.0.0
Go MAEDA 2 years ago
parent
commit
9670c7fe22
1 changed files with 1 additions and 3 deletions
  1. 1
    3
      app/models/mailer.rb

+ 1
- 3
app/models/mailer.rb View File

@@ -643,9 +643,7 @@ class Mailer < ActionMailer::Base
# any/all of the .deliver_later emails are processed
def self.with_synched_deliveries(&block)
adapter = ActionMailer::MailDeliveryJob.queue_adapter
if adapter.is_a?(ActiveJob::QueueAdapters::AsyncAdapter)
ActionMailer::MailDeliveryJob.queue_adapter = ActiveJob::QueueAdapters::InlineAdapter.new
end
ActionMailer::MailDeliveryJob.queue_adapter = ActiveJob::QueueAdapters::InlineAdapter.new
yield
ensure
ActionMailer::MailDeliveryJob.queue_adapter = adapter

Loading…
Cancel
Save