From 208888038375d48cc91cf481a3f8509d63d8e1ad Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Mon, 24 Aug 2015 10:57:35 -0700 Subject: Ignore empty incoming messages. --- app/mailers/email_rejection_mailer.rb | 2 ++ app/workers/email_receiver_worker.rb | 2 ++ 2 files changed, 4 insertions(+) (limited to 'app') diff --git a/app/mailers/email_rejection_mailer.rb b/app/mailers/email_rejection_mailer.rb index 89aceda82d1..883f1c73ad4 100644 --- a/app/mailers/email_rejection_mailer.rb +++ b/app/mailers/email_rejection_mailer.rb @@ -3,6 +3,8 @@ class EmailRejectionMailer < BaseMailer @reason = reason @original_message = Mail::Message.new(original_raw) + return unless @original_message.from + headers = { to: @original_message.from, subject: "[Rejected] #{@original_message.subject}" diff --git a/app/workers/email_receiver_worker.rb b/app/workers/email_receiver_worker.rb index a588a1f45ee..8cfb96ef376 100644 --- a/app/workers/email_receiver_worker.rb +++ b/app/workers/email_receiver_worker.rb @@ -18,6 +18,8 @@ class EmailReceiverWorker def handle_failure(raw, e) Rails.logger.warn("Email can not be processed: #{e}\n\n#{raw}") + return unless raw.present? + can_retry = false reason = nil -- cgit v1.2.1