AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-14 19:16:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: add timeout to SMTPClient to prevent worker blocking (#4352)

Browse Source
This commit is contained in:
Charles Zhou 2024-05-14 10:44:53 -05:00 committed by GitHub
parent 98140ae5d9
commit 2eb468f885
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
api/libs/smtp.py
View File

@ -1,3 +1,4 @@
import logging
import smtplib import smtplib
from email.mime.multipart import MIMEMultipart from email.mime.multipart import MIMEMultipart
from email.mime.text import MIMEText from email.mime.text import MIMEText
@ -13,15 +14,30 @@ class SMTPClient:
self._use_tls = use_tls self._use_tls = use_tls
def send(self, mail: dict): def send(self, mail: dict):
smtp = smtplib.SMTP(self.server, self.port) smtp = None
if self._use_tls: try:
smtp.starttls() smtp = smtplib.SMTP(self.server, self.port, timeout=10)
if self.username and self.password: if self._use_tls:
smtp.login(self.username, self.password) smtp.starttls()
msg = MIMEMultipart() if self.username and self.password:
msg['Subject'] = mail['subject'] smtp.login(self.username, self.password)
msg['From'] = self._from
msg['To'] = mail['to'] msg = MIMEMultipart()
msg.attach(MIMEText(mail['html'], 'html')) msg['Subject'] = mail['subject']
smtp.sendmail(self.username, mail['to'], msg.as_string()) msg['From'] = self._from
smtp.quit() msg['To'] = mail['to']
msg.attach(MIMEText(mail['html'], 'html'))
smtp.sendmail(self._from, mail['to'], msg.as_string())
except smtplib.SMTPException as e:
logging.error(f"SMTP error occurred: {str(e)}")
raise
except TimeoutError as e:
logging.error(f"Timeout occurred while sending email: {str(e)}")
raise
except Exception as e:
logging.error(f"Unexpected error occurred while sending email: {str(e)}")
raise
finally:
if smtp:
smtp.quit()