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

log more

This commit is contained in:
Son NK 2020-12-02 12:40:29 +01:00
parent 66abbf2614
commit b7fdbe7721
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
email_handler.py
View File

@ -1401,11 +1401,12 @@ def handle_spam(
if is_reply: if is_reply:
LOG.d( LOG.d(
"Inform %s (%s) about spam email sent from alias %s to %s", "Inform %s (%s) about spam email sent from alias %s to %s. %s",
mailbox, mailbox,
user, user,
alias, alias,
contact, contact,
refused_email,
) )
send_email_with_rate_control( send_email_with_rate_control(
user, user,
@ -1673,8 +1674,9 @@ def get_spam_score(message: Message) -> float:
try: try:
# wait for at max 300s which is the default spamd timeout-child # wait for at max 300s which is the default spamd timeout-child
sa = SpamAssassin(sa_input, host=SPAMASSASSIN_HOST, timeout=300) sa = SpamAssassin(sa_input, host=SPAMASSASSIN_HOST, timeout=300)
LOG.d("SA report %s", sa.get_report_json()) score = sa.get_score()
return sa.get_score() LOG.d("SA report, score %s. %s", score, sa.get_report_json())
return score
except Exception: except Exception:
LOG.exception("SpamAssassin exception") LOG.exception("SpamAssassin exception")
# return a negative score so the message is always considered as ham # return a negative score so the message is always considered as ham