From 1cdc5d1351b80cb0a41eb19a76908d5e59248377 Mon Sep 17 00:00:00 2001 From: link2xt Date: Thu, 19 Oct 2023 02:22:38 +0000 Subject: [PATCH] Revert "open a persistent client between the BeforeQueueHandler and postfix smtpd without content filter" This reverts commit fb2ea274776b297cf4f21ab143ab9e8e1027532a. --- chatmaild/src/chatmaild/filtermail.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chatmaild/src/chatmaild/filtermail.py b/chatmaild/src/chatmaild/filtermail.py index aac8e9e1..79fe1b66 100644 --- a/chatmaild/src/chatmaild/filtermail.py +++ b/chatmaild/src/chatmaild/filtermail.py @@ -42,7 +42,6 @@ class SMTPController(Controller): class BeforeQueueHandler: def __init__(self): self.send_rate_limiter = SendRateLimiter() - self.smtp = SMTPClient("localhost", "10025") async def handle_MAIL(self, server, session, envelope, address, mail_options): logging.info(f"handle_MAIL from {address}") @@ -62,7 +61,8 @@ class BeforeQueueHandler: if error: return error logging.info("re-injecting the mail that passed checks") - self.smtp.sendmail(envelope.mail_from, envelope.rcpt_tos, envelope.content) + client = SMTPClient("localhost", "10025") + client.sendmail(envelope.mail_from, envelope.rcpt_tos, envelope.content) return "250 OK"