github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-25 21:24:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
riking 2014-06-23 17:48:51 -07:00
parent 8b5d2b835a
commit 222db71dd7
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,7 @@ module Jobs
when ActiveRecord::Rollback when ActiveRecord::Rollback
message_template = :email_reject_post_error message_template = :email_reject_post_error
else else
nil message_template = nil
end end
if message_template if message_template
@ -51,6 +51,7 @@ module Jobs
Rails.logger.error e Rails.logger.error e
# If not known type, inform admins about the error # If not known type, inform admins about the error
# (Add to above case with a good error message!)
data = { limit_once_per: false, message_params: { from: message.from, source: message.body, error: "#{e.message}\n\n#{e.backtrace.join("\n")}" }} data = { limit_once_per: false, message_params: { from: message.from, source: message.body, error: "#{e.message}\n\n#{e.backtrace.join("\n")}" }}
GroupMessage.create(Group[:admins].name, :email_error_notification, data) GroupMessage.create(Group[:admins].name, :email_error_notification, data)
end end

2
config/locales/server.en.yml
View File

@ -1351,6 +1351,8 @@ en:
The Markdown could not be processed. The Markdown could not be processed.
%{error}
email_reject_reply_key: email_reject_reply_key:
subject_template: "Message rejected: Bad Reply Key" subject_template: "Message rejected: Bad Reply Key"
text_body_template: | text_body_template: |