diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2017-06-15 07:02:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-15 07:02:47 -0500 |
| commit | 95ae033e7f6747fa7a65c74c66922c8d9fe66808 (patch) | |
| tree | 9c7b501f4bc02a9c80bedbbc7e2d9653f86a1ead /actionmailer/lib | |
| parent | d9496c19c07d56bb200acd7312bf5d6355d515f4 (diff) | |
| parent | d9bbde09fc57b29b889baadda18da943428fb06a (diff) | |
| download | rails-95ae033e7f6747fa7a65c74c66922c8d9fe66808.tar.gz rails-95ae033e7f6747fa7a65c74c66922c8d9fe66808.tar.bz2 rails-95ae033e7f6747fa7a65c74c66922c8d9fe66808.zip | |
Merge pull request #29457 from halogenandtoast/mm-configure_delivery_job
Allow mailers to configure their delivery job
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 1 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/message_delivery.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 7133670b65..f8aa54bd44 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -459,6 +459,7 @@ module ActionMailer helper ActionMailer::MailHelper + class_attribute :delivery_job, default: ::ActionMailer::DeliveryJob class_attribute :default_params, default: { mime_version: "1.0", charset: "UTF-8", diff --git a/actionmailer/lib/action_mailer/message_delivery.rb b/actionmailer/lib/action_mailer/message_delivery.rb index cf7c57e6bf..595646d002 100644 --- a/actionmailer/lib/action_mailer/message_delivery.rb +++ b/actionmailer/lib/action_mailer/message_delivery.rb @@ -118,7 +118,8 @@ module ActionMailer "method*, or 3. use a custom Active Job instead of #deliver_later." else args = @mailer_class.name, @action.to_s, delivery_method.to_s, *@args - ::ActionMailer::DeliveryJob.set(options).perform_later(*args) + job = @mailer_class.delivery_job + job.set(options).perform_later(*args) end end end |