Merge remote branch 'mainstream/master'

Conflicts:
	actionpack/lib/action_controller/metal/flash.rb

1 files changed, 20 insertions, 0 deletions

diff --git a/actionmailer/lib/action_mailer/railties/subscriber.rb b/actionmailer/lib/action_mailer/railties/subscriber.rb
new file mode 100644
index 0000000000..af9c477237
--- /dev/null
+++ b/actionmailer/lib/action_mailer/railties/subscriber.rb
@@ -0,0 +1,20 @@
+module ActionMailer
+  module Railties
+    class Subscriber < Rails::Subscriber
+      def deliver(event)
+        recipients = Array(event.payload[:to]).join(', ')
+        info("Sent mail to #{recipients} (%1.fms)" % event.duration)
+        debug("\n#{event.payload[:mail]}")
+      end
+
+      def receive(event)
+        info("Received mail (%.1fms)" % event.duration)
+        debug("\n#{event.payload[:mail]}")
+      end
+
+      def logger
+        ActionMailer::Base.logger
+      end
+    end
+  end
+end
\ No newline at end of file