codeninjasllc/discourse
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FIX: properly handle failure in poll mailbox job

Browse source
This commit is contained in:
Régis Hanol 2016-03-21 18:49:01 +01:00
parent f68671a813
commit 9c61f45bf9
1 changed files with 3 additions and 2 deletions

5
app/jobs/scheduled/poll_mailbox.rb
View file

@ -57,6 +57,7 @@ module Jobs
end end
template_args = {} template_args = {}
client_message = nil
# there might be more information available in the exception # there might be more information available in the exception
if message_template == :email_reject_invalid_post && e.message.size > 6 if message_template == :email_reject_invalid_post && e.message.size > 6
@ -77,12 +78,12 @@ module Jobs
client_message = RejectionMailer.send_rejection(message_template, message.from, template_args) client_message = RejectionMailer.send_rejection(message_template, message.from, template_args)
Email::Sender.new(client_message, message_template).send Email::Sender.new(client_message, message_template).send
client_message
else else
mark_as_errored! mark_as_errored!
Discourse.handle_job_exception(e, error_context(@args, "Unrecognized error type when processing incoming email", mail: mail_string)) Discourse.handle_job_exception(e, error_context(@args, "Unrecognized error type when processing incoming email", mail: mail_string))
end end
client_message
end end
def poll_pop3 def poll_pop3