Log email delivery errors.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3356 e93f8b46-1217-0410-a6f0-8f06a7374b81

Log email delivery errors.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3356 e93f8b46-1217-0410-a6f0-8f06a7374b81
df46d704 · Jean-Philippe Lang · a0364deb · df46d704
Commit df46d704 authored Jan 31, 2010 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 1 deletion

mailer.rb app/models/mailer.rb +15 -1

No files found.
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -284,7 +284,21 @@ class Mailer < ActionMailer::Base
    if @references_objects
      mail.references = @references_objects.collect {|o| self.class.message_id_for(o)}
    end
-    super(mail)
+    
+    # Log errors when raise_delivery_errors is set to false, Rails does not
+    raise_errors = self.class.raise_delivery_errors
+    self.class.raise_delivery_errors = true
+    begin
+      return super(mail)
+    rescue Exception => e
+      if raise_errors
+        raise e
+      elsif mylogger
+        mylogger.error "The following error occured while sending email notification: \"#{e.message}\". Check your configuration in config/email.yml."
+      end
+    ensure
+      self.class.raise_delivery_errors = raise_errors
+    end
  end

  # Sends reminders to issue assignees