Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-06 03:18:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add mutex around incoming email processing

Browse Source
This commit is contained in:
Régis Hanol 2017-05-18 01:09:51 +02:00
parent 2a5a01af2e
commit 80435cf2af
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/email/receiver.rb
View File

@ -39,12 +39,16 @@ module Email
def process!
return if is_blacklisted?
@from_email, @from_display_name = parse_from_field(@mail)
@incoming_email = find_or_create_incoming_email
process_internal
rescue => e
@incoming_email.update_columns(error: e.to_s) if @incoming_email
raise
DistributedMutex.synchronize(@message_id) do
begin
@from_email, @from_display_name = parse_from_field(@mail)
@incoming_email = find_or_create_incoming_email
process_internal
rescue => e
@incoming_email.update_columns(error: e.to_s) if @incoming_email
raise
end
end
end
def is_blacklisted?