github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-06-27 07:17:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3818 from jumpserver/dev_bai

Browse Source 
[Update] 修改任务执行日期显示本地时间
This commit is contained in:
BaiJiangJie 2020-03-24 08:57:45 +08:00 committed by GitHub
commit a09b0c6c06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/ops/models/adhoc.py
View File

@ -278,7 +278,7 @@ class AdHocExecution(OrgModelMixin):
raw = '' raw = ''
try: try:
date_start_s = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S') date_start_s = timezone.now().now().strftime('%Y-%m-%d %H:%M:%S')
print(_("{} Start task: {}").format(date_start_s, self.task.name)) print(_("{} Start task: {}").format(date_start_s, self.task.name))
raw, summary = self.start_runner() raw, summary = self.start_runner()
except Exception as e: except Exception as e:
@ -286,7 +286,7 @@ class AdHocExecution(OrgModelMixin):
raw = {"dark": {"all": str(e)}, "contacted": []} raw = {"dark": {"all": str(e)}, "contacted": []}
finally: finally:
self.clean_up(summary, time_start) self.clean_up(summary, time_start)
date_end = timezone.now() date_end = timezone.now().now()
date_end_s = date_end.strftime('%Y-%m-%d %H:%M:%S') date_end_s = date_end.strftime('%Y-%m-%d %H:%M:%S')
print(_("{} Task finish").format(date_end_s)) print(_("{} Task finish").format(date_end_s))
print('.\n\n.') print('.\n\n.')