From d9bbde09fc57b29b889baadda18da943428fb06a Mon Sep 17 00:00:00 2001
From: Matthew Mongeau <halogenandtoast@gmail.com>
Date: Thu, 15 Jun 2017 16:12:44 +0900
Subject: Allow mailers to configure their delivery job

Setting delivery_job on a mailer class will cause MessageDelivery to use
the specified job instead of ActionMailer::DeliveryJob:

    class MyMailer < ApplicationMailer
      self.delivery_job = MyCustomDeliveryJob

      ...
    end
---
 actionmailer/lib/action_mailer/base.rb             | 1 +
 actionmailer/lib/action_mailer/message_delivery.rb | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'actionmailer/lib')

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
-- 
cgit v1.2.3