github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2026-01-04 15:14:01 +00:00
Code Issues Projects Releases Wiki Activity

pref: 修改 activity log (#9571)

Browse Source 
* pref: 修改 activity log

* perf: 优化 acitivity

* pref: 修改 activity

* fix: 修复一些运行问题

* fix: app.py 中添加 tasks import

* fix: 添加 activity_callback

* fix: 添加 execute_account_backup_plan activity_callback

* fix: 添加 activity_callback -> gather_asset_accounts

* fix: 对 celery 任务添加 activity_callback 回调

* fix: 修改翻译

---------

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com>
Co-authored-by: Bai <baijiangjie@gmail.com>
This commit is contained in:
fit2bot
2023-02-17 17:14:53 +08:00
committed by GitHub
parent 01c2e7128d
commit 9a62a7aaab
46 changed files with 700 additions and 653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/common/tasks.py
View File

@@ -10,7 +10,14 @@ from .utils import get_logger
logger = get_logger(__file__)
@shared_task(verbose_name=_("Send email"))
def task_activity_callback(self, subject, message, from_email, recipient_list, **kwargs):
from users.models import User
email_list = recipient_list
resource_ids = list(User.objects.filter(email__in=email_list).values_list('id', flat=True))
return resource_ids
@shared_task(verbose_name=_("Send email"), activity_callback=task_activity_callback)
def send_mail_async(*args, **kwargs):
""" Using celery to send email async
@@ -19,7 +26,7 @@ def send_mail_async(*args, **kwargs):
Example:
send_mail_sync.delay(subject, message, from_mail, recipient_list, fail_silently=False, html_message=None)
Also you can ignore the from_mail, unlike django send_mail, from_email is not a require args:
Also, you can ignore the from_mail, unlike django send_mail, from_email is not a required args:
Example:
send_mail_sync.delay(subject, message, recipient_list, fail_silently=False, html_message=None)
@@ -37,7 +44,7 @@ def send_mail_async(*args, **kwargs):
logger.error("Sending mail error: {}".format(e))
@shared_task(verbose_name=_("Send email attachment"))
@shared_task(verbose_name=_("Send email attachment"), activity_callback=task_activity_callback)
def send_mail_attachment_async(subject, message, recipient_list, attachment_list=None):
if attachment_list is None:
attachment_list = []