diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-19 21:34:42 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-19 21:34:59 +0100 |
| commit | 848d6cd46b93ef9b1e755449a1de7cee56e7e115 (patch) | |
| tree | c4a0fb74fbee078976ca79e34492498c48a3f871 /actionmailer/lib/action_mailer/base.rb | |
| parent | d8c30723aad943da20fed36cceedba6225122a3a (diff) | |
| download | rails-848d6cd46b93ef9b1e755449a1de7cee56e7e115.tar.gz rails-848d6cd46b93ef9b1e755449a1de7cee56e7e115.tar.bz2 rails-848d6cd46b93ef9b1e755449a1de7cee56e7e115.zip | |
Mail should log when raise_delivery_methods is false.
Diffstat (limited to 'actionmailer/lib/action_mailer/base.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index a8233512ab..356861b591 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -524,14 +524,16 @@ module ActionMailer #:nodoc: def deliver!(mail = @mail) raise "no mail object available for delivery!" unless mail - begin - ActiveSupport::Notifications.instrument("action_mailer.deliver", - :template => template, :mailer => self.class.name) do |payload| - self.class.set_payload_for_mail(payload, mail) + ActiveSupport::Notifications.instrument("action_mailer.deliver", + :template => template, :mailer => self.class.name) do |payload| + + self.class.set_payload_for_mail(payload, mail) + + begin self.delivery_method.perform_delivery(mail) if perform_deliveries + rescue Exception => e # Net::SMTP errors or sendmail pipe errors + raise e if raise_delivery_errors end - rescue Exception => e # Net::SMTP errors or sendmail pipe errors - raise e if raise_delivery_errors end mail |