sanity check to make sure the message id hasn't been added before

This commit is contained in:
Son 2021-10-19 11:58:05 +02:00
parent c12f3b3e7a
commit 7952ce7ecf
1 changed files with 14 additions and 4 deletions

View File

@ -1062,10 +1062,20 @@ def handle_reply(envelope, msg: Message, rcpt_to: str) -> (bool, str):
msg[headers.MESSAGE_ID] = sl_message_id
email_log.sl_message_id = sl_message_id
MessageIDMatching.create(
sl_message_id=sl_message_id,
original_message_id=original_message_id,
)
# sanity check to make sure the message id hasn't been added before
if not MessageIDMatching.get_by(
sl_message_id=sl_message_id
) and not MessageIDMatching.get_by(original_message_id=original_message_id):
MessageIDMatching.create(
sl_message_id=sl_message_id,
original_message_id=original_message_id,
)
else:
LOG.w(
"Same SL or Original Message ID has been added before %s %s",
sl_message_id,
original_message_id,
)
Session.commit()