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

perf: 优化任务记录 activity

pull/11833/head
ibuler 2023-10-12 16:36:08 +08:00 committed by 老广
parent 9f042cfa04
commit 116d0ba5c6
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/audits/signal_handlers/activity_log.py
View File

@ -94,6 +94,8 @@ def after_task_publish_for_activity_log(headers=None, body=None, **kwargs):
logger.error(f'Get celery task info error: {e}', exc_info=True) logger.error(f'Get celery task info error: {e}', exc_info=True)
else: else:
logger.debug(f'Create activity log for celery task: {task_id}') logger.debug(f'Create activity log for celery task: {task_id}')
if not resource_ids:
return
create_activities(resource_ids, detail, task_id, action=ActivityChoices.task, org_id=org_id) create_activities(resource_ids, detail, task_id, action=ActivityChoices.task, org_id=org_id)

2
apps/authentication/mixins.py
View File

@ -19,7 +19,7 @@ from django.utils.translation import gettext as _
from rest_framework.request import Request from rest_framework.request import Request
from acls.models import LoginACL from acls.models import LoginACL
from common.utils import get_request_ip_or_data, get_logger, bulk_get, FlashMessageUtil from common.utils import get_request_ip_or_data, get_request_ip, get_logger, bulk_get, FlashMessageUtil
from users.models import User from users.models import User
from users.utils import LoginBlockUtil, MFABlockUtils, LoginIpBlockUtil from users.utils import LoginBlockUtil, MFABlockUtils, LoginIpBlockUtil
from . import errors from . import errors