Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved email processing - added error/timeout handling.

Browse source
This commit is contained in:
Martin Edenhofer 2019-01-29 21:35:22 +01:00
parent 295e67cb6f
commit a17137c4a5
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/models/channel/email_parser.rb
View file

@ -3,6 +3,7 @@
# encoding: utf-8 # encoding: utf-8
class Channel::EmailParser class Channel::EmailParser
PROZESS_TIME_MAX = 180
EMAIL_REGEX = /.+@.+/.freeze EMAIL_REGEX = /.+@.+/.freeze
RECIPIENT_FIELDS = %w[to cc delivered-to x-original-to envelope-to].freeze RECIPIENT_FIELDS = %w[to cc delivered-to x-original-to envelope-to].freeze
SENDER_FIELDS = %w[from reply-to return-path sender].freeze SENDER_FIELDS = %w[from reply-to return-path sender].freeze
@ -106,7 +107,9 @@ returns
def process(channel, msg, exception = true) def process(channel, msg, exception = true)
_process(channel, msg) Timeout.timeout(PROZESS_TIME_MAX) do
_process(channel, msg)
end
rescue => e rescue => e
# store unprocessable email for bug reporting # store unprocessable email for bug reporting
path = Rails.root.join('tmp', 'unprocessable_mail') path = Rails.root.join('tmp', 'unprocessable_mail')