Mirror
/
app-MAIL-temp
mirror of https://github.com/simple-login/app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

retry get_spam_score 1 more time

This commit is contained in:
Son NK 2020-12-31 11:26:12 +01:00
parent 1c22e14f68
commit 01da9aafcd
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
email_handler.py
View File

@ -1642,7 +1642,7 @@ async def get_spam_score_async(message: Message) -> float:
return -999
def get_spam_score(message: Message, email_log: EmailLog) -> float:
def get_spam_score(message: Message, email_log: EmailLog, can_retry=True) -> float:
LOG.debug("get spam score for %s", email_log)
sa_input = to_bytes(message)
@ -1658,9 +1658,14 @@ def get_spam_score(message: Message, email_log: EmailLog) -> float:
LOG.d("SA report for %s, score %s. %s", email_log, score, sa.get_report_json())
return score
except Exception:
LOG.exception("SpamAssassin exception")
# return a negative score so the message is always considered as ham
return -999
if can_retry:
LOG.warning("SpamAssassin exception, retry")
time.sleep(3)
return get_spam_score(message, email_log, can_retry=False)
else:
# return a negative score so the message is always considered as ham
LOG.exception("SpamAssassin exception, ignore spam check")
return -999
def sl_sendmail(