External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-28 22:35:08 -02:30
Code Issues Packages Projects Releases Wiki Activity

Update elapsed in real time when job is running.

Browse Source
This commit is contained in:
Chris Church
2016-11-28 14:35:37 -05:00
parent 34add726b7
commit cbc52c7b69
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/api/serializers.py
View File

@@ -24,6 +24,7 @@ from django.db import models
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.utils.encoding import force_text from django.utils.encoding import force_text
from django.utils.text import capfirst from django.utils.text import capfirst
from django.utils.timezone import now
# Django REST Framework # Django REST Framework
from rest_framework.exceptions import ValidationError from rest_framework.exceptions import ValidationError
@@ -620,8 +621,13 @@ class UnifiedJobSerializer(BaseSerializer):
ret = serializer.to_representation(obj) ret = serializer.to_representation(obj)
else: else:
ret = super(UnifiedJobSerializer, self).to_representation(obj) ret = super(UnifiedJobSerializer, self).to_representation(obj)
if 'elapsed' in ret: if 'elapsed' in ret:
if obj and obj.pk and obj.started and not obj.finished:
td = now() - obj.started
ret['elapsed'] = (td.microseconds + (td.seconds + td.days * 24 * 3600) * 10 ** 6) / (10 ** 6 * 1.0)
ret['elapsed'] = float(ret['elapsed']) ret['elapsed'] = float(ret['elapsed'])
return ret return ret
def get_result_stdout(self, obj): def get_result_stdout(self, obj):