github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-04-28 03:21:12 +00:00
Code Issues Projects Releases Wiki Activity

perf: change record dashboard

Browse Source
This commit is contained in:
feng 2025-03-10 14:46:54 +08:00 committed by feng626
parent 243083e876
commit 423d6db2ac
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/accounts/api/automations/change_secret.py
View File

@ -75,11 +75,12 @@ class ChangeSecretRecordViewSet(mixins.ListModelMixin, OrgGenericViewSet):
date_finished=Subquery( date_finished=Subquery(
recent_dates.filter(account=OuterRef('account')).values('max_date_finished')[:1] recent_dates.filter(account=OuterRef('account')).values('max_date_finished')[:1]
) )
).filter(Q(status=ChangeSecretRecordStatusChoice.success) | Q(ignore_fail=True)) ).filter(Q(status=ChangeSecretRecordStatusChoice.success))
failed_records = queryset.filter( failed_records = queryset.filter(
~Q(account__in=Subquery(recent_success_accounts.values('account'))), ~Q(account__in=Subquery(recent_success_accounts.values('account'))),
status=ChangeSecretRecordStatusChoice.failed status=ChangeSecretRecordStatusChoice.failed,
ignore_fail=False
) )
return failed_records return failed_records

2
apps/accounts/automations/base/manager.py
View File

@ -144,7 +144,7 @@ class BaseChangeSecretPushManager(AccountBasePlaybookManager):
if exist: if exist:
print(f"Data inserted, updating recorder status after {attempt + 1}th query") print(f"Data inserted, updating recorder status after {attempt + 1}th query")
recorder.save(update_fields=['status', 'date_finished']) recorder.save(update_fields=['error', 'status', 'date_finished'])
return True return True
print(f"Data not ready, waiting {retry_interval} second(s) and retrying ({attempt + 1}/{max_retries})") print(f"Data not ready, waiting {retry_interval} second(s) and retrying ({attempt + 1}/{max_retries})")