Added delivery_handler method to mail and implemented in ActionMailer to deliver inside of instrumentation

2 files changed, 12 insertions, 3 deletions

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 552fd7ccb8..4e5e1bbb29 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -326,10 +326,19 @@ module ActionMailer #:nodoc:
         end
       end
 
-      # TODO The delivery should happen inside the instrument block
-      def delivered_email(mail) #:nodoc:
+      def deliver_mail(mail) #:nodoc:
         ActiveSupport::Notifications.instrument("action_mailer.deliver") do |payload|
           self.set_payload_for_mail(payload, mail)
+
+          if mail.perform_deliveries
+            begin
+              mail.deliver!
+            rescue Exception => e
+              raise e if mail.raise_delivery_errors
+            end
+            Mail.deliveries << mail
+          end
+
         end
       end
 
diff --git a/actionmailer/lib/action_mailer/delivery_methods.rb b/actionmailer/lib/action_mailer/delivery_methods.rb
index 21909d5d57..7a6b410932 100644
--- a/actionmailer/lib/action_mailer/delivery_methods.rb
+++ b/actionmailer/lib/action_mailer/delivery_methods.rb
@@ -63,7 +63,7 @@ module ActionMailer
 
       def wrap_delivery_behavior(mail, method=nil) #:nodoc:
         method ||= self.delivery_method
-        mail.register_for_delivery_notification(self)
+        mail.delivery_handler = self
 
         if method.is_a?(Symbol)
           if klass = delivery_methods[method.to_sym]