github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 01:22:36 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2459 from riking/email

Browse Source 
DEBUG: Send all email processing errors to admins
This commit is contained in:
Robin Ward 2014-06-20 12:52:50 -04:00
commit 94de396b99
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/jobs/scheduled/poll_mailbox.rb
View File

@ -27,8 +27,10 @@ module Jobs
message = Mail::Message.new(mail_string)
client_message = RejectionMailer.send_trust_level(message.from, message.body)
Email::Sender.new(client_message, :email_reject_trust_level).send
rescue Email::Receiver::ProcessingError
# all other ProcessingErrors are ok to be dropped
rescue Email::Receiver::ProcessingError => e
# inform admins about the error
data = { limit_once_per: false, message_params: { source: mail, error: e }}
GroupMessage.create(Group[:admins].name, :email_error_notification, data)
rescue StandardError => e
# inform admins about the error
data = { limit_once_per: false, message_params: { source: mail, error: e }}

2
app/mailers/rejection_mailer.rb
View File

@ -4,7 +4,7 @@ class RejectionMailer < ActionMailer::Base
include Email::BuildEmailHelper
def send_rejection(from, body)
build_email(from, template: 'email_reject_notification', from: from, body: body)
build_email(from, template: 'email_error_notification', from: from, body: body)
end
def send_trust_level(from, body, to)