github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

perf: 优化发送邮件

pull/11721/head
ibuler 2023-09-27 10:31:44 +08:00 committed by Bryan
parent 56a26481a4
commit 2069fee795
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/common/tasks.py
View File

@ -36,7 +36,9 @@ def send_mail_async(*args, **kwargs):
args[0] = (settings.EMAIL_SUBJECT_PREFIX or '') + args[0] args[0] = (settings.EMAIL_SUBJECT_PREFIX or '') + args[0]
from_email = settings.EMAIL_FROM or settings.EMAIL_HOST_USER from_email = settings.EMAIL_FROM or settings.EMAIL_HOST_USER
args.insert(2, from_email) args.insert(2, from_email)
args = tuple(args)
args[3] = [mail for mail in args[3] if mail != 'admin@mycomany.com']
args = tuple(args)
try: try:
return send_mail(*args, **kwargs) return send_mail(*args, **kwargs)
@ -50,6 +52,7 @@ def send_mail_attachment_async(subject, message, recipient_list, attachment_list
attachment_list = [] attachment_list = []
from_email = settings.EMAIL_FROM or settings.EMAIL_HOST_USER from_email = settings.EMAIL_FROM or settings.EMAIL_HOST_USER
subject = (settings.EMAIL_SUBJECT_PREFIX or '') + subject subject = (settings.EMAIL_SUBJECT_PREFIX or '') + subject
recipient_list = [mail for mail in recipient_list if mail != 'admin@mycomany.com']
email = EmailMultiAlternatives( email = EmailMultiAlternatives(
subject=subject, subject=subject,
body=message, body=message,