summaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2015-11-14 11:34:45 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2015-11-14 11:34:45 +0000
commit41c379fb783f00247cb6303fe8278ded763cff8a (patch)
treef1485dcea0cb4190c12f9207b5bde8547799d25a /app/models
parent2e0da3ec79b51eb05573d449fd2b9942b452003d (diff)
downloadredmine-41c379fb783f00247cb6303fe8278ded763cff8a.tar.gz
redmine-41c379fb783f00247cb6303fe8278ded763cff8a.zip
Fixed that some mail handler log messages are not prepended with "MailHandler:" (#21226).
git-svn-id: http://svn.redmine.org/redmine/trunk@14880 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models')
-rw-r--r--app/models/mail_handler.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
index 99462179e..0c3d34c41 100644
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -54,7 +54,7 @@ class MailHandler < ActionMailer::Base
def self.safe_receive(*args)
receive(*args)
rescue Exception => e
- logger.error "An unexpected error occurred when receiving email: #{e.message}" if logger
+ logger.error "MailHandler: an unexpected error occurred when receiving email: #{e.message}" if logger
return false
end
@@ -176,7 +176,7 @@ class MailHandler < ActionMailer::Base
end
rescue ActiveRecord::RecordInvalid => e
# TODO: send a email to the user
- logger.error e.message if logger
+ logger.error "MailHandler: #{e.message}" if logger
false
rescue MissingInformation => e
logger.error "MailHandler: missing information from #{user}: #{e.message}" if logger