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

perf: 账号备份log (#8106) 

Co-authored-by: feng626 <1304903146@qq.com>
pull/8111/head
fit2bot 2022-04-20 11:18:50 +08:00 committed by GitHub
parent af9248ef7c
commit 7647438792
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/assets/task_handlers/backup/handlers.py
View File

@ -156,10 +156,7 @@ class AccountBackupHandler:
logger.info('步骤完成: 用时 {}s'.format(timedelta)) logger.info('步骤完成: 用时 {}s'.format(timedelta))
return files return files
def send_backup_mail(self, files): def send_backup_mail(self, files, recipients):
recipients = self.execution.plan_snapshot.get('recipients')
if not recipients:
return
if not files: if not files:
return return
recipients = User.objects.filter(id__in=list(recipients)) recipients = User.objects.filter(id__in=list(recipients))
@ -198,8 +195,16 @@ class AccountBackupHandler:
is_success = False is_success = False
error = '-' error = '-'
try: try:
files = self.create_excel() recipients = self.execution.plan_snapshot.get('recipients')
self.send_backup_mail(files) if not recipients:
logger.info(
'\n'
'\033[32m>>> 该备份任务未分配收件人\033[0m'
''
)
else:
files = self.create_excel()
self.send_backup_mail(files, recipients)
except Exception as e: except Exception as e:
self.is_frozen = True self.is_frozen = True
logger.error('任务执行被异常中断') logger.error('任务执行被异常中断')