External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-17 12:41:19 -03:30
Code Issues Packages Projects Releases Wiki Activity

the returned self.elapsed should be decimal, instead of float, to match django model field type

Browse Source
This commit is contained in:
Seth Foster 2021-04-08 11:36:40 -04:00
parent 09c176847d
commit f05ffa521a
No known key found for this signature in database
GPG Key ID: 86E90D96F7184028
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/models/unified_jobs.py
View File

@ -4,6 +4,7 @@
# Python
from io import StringIO
import datetime
import decimal
import codecs
import json
import logging
@ -842,8 +843,9 @@ class UnifiedJob(
if 'finished' not in update_fields:
update_fields.append('finished')
dq = decimal.Decimal('1.000')
if self.elapsed is None:
self.elapsed = 0.0
self.elapsed = decimal.Decimal(0.0).quantize(dq)
if 'elapsed' not in update_fields:
update_fields.append('elapsed')
@ -851,7 +853,8 @@ class UnifiedJob(
# out the time that elapsed, do so.
if self.started and self.finished and self.elapsed == 0.0:
td = self.finished - self.started
self.elapsed = str((td.microseconds + (td.seconds + td.days * 24 * 3600) * 10 ** 6) / (10 ** 6 * 1.0))
elapsed = decimal.Decimal(td.total_seconds())
self.elapsed = elapsed.quantize(dq)
if 'elapsed' not in update_fields:
update_fields.append('elapsed')