github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-05 09:21:02 +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

23
apps/accounts/tasks/automation.py
View File

@@ -1,20 +1,21 @@
from celery import shared_task
from django.utils.translation import gettext_lazy as _
from orgs.utils import tmp_to_root_org, tmp_to_org
from common.utils import get_logger, get_object_or_none
from accounts.const import AutomationTypes
from common.utils import get_logger
from orgs.utils import tmp_to_org
logger = get_logger(__file__)
@shared_task(queue='ansible', verbose_name=_('Account execute automation'))
def execute_automation(pid, trigger, tp):
model = AutomationTypes.get_type_model(tp)
with tmp_to_root_org():
instance = get_object_or_none(model, pk=pid)
if not instance:
logger.error("No automation task found: {}".format(pid))
return
def task_activity_callback(self, instance, *args):
asset_ids = instance.get_all_asset_ids()
return asset_ids, instance.org_id
@shared_task(
queue='ansible', verbose_name=_('Account execute automation'),
activity_callback=task_activity_callback
)
def execute_automation(instance, trigger):
with tmp_to_org(instance.org):
instance.execute(trigger)