Merge remote branch 'mainstream/master'

Conflicts:
	activerecord/lib/active_record/base.rb
	railties/lib/rails/configuration.rb
	railties/lib/rails/log_subscriber.rb

1 files changed, 20 insertions, 0 deletions

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