summaryrefslogtreecommitdiffstats
path: root/app/models/mailer.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/mailer.rb')
-rw-r--r--app/models/mailer.rb12
1 files changed, 11 insertions, 1 deletions
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 5c773c5f1..83dbd9fc6 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -430,7 +430,17 @@ class Mailer < ActionMailer::Base
def self.deliver_mail(mail)
return false if mail.to.blank? && mail.cc.blank? && mail.bcc.blank?
- super
+ begin
+ # Log errors when raise_delivery_errors is set to false, Rails does not
+ mail.raise_delivery_errors = true
+ super
+ rescue Exception => e
+ if ActionMailer::Base.raise_delivery_errors
+ raise e
+ else
+ Rails.logger.error "Email delivery error: #{e.message}"
+ end
+ end
end
def self.method_missing(method, *args, &block)