External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-10 19:07:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Count the actual events instead of the records returned from the queryset

Browse Source
This commit is contained in:
Matthew Jones
2014-07-16 14:24:28 -04:00
parent 81f83766f0
commit a7a092f30a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/views.py
View File

@@ -1741,8 +1741,6 @@ class JobJobTasksList(BaseJobEventsList):
.annotate(num=Count('event')) .annotate(num=Count('event'))
.order_by('parent__id')) .order_by('parent__id'))
count = queryset.count()
# The data above will come back in a list, but we are going to # The data above will come back in a list, but we are going to
# want to access it based on the parent id, so map it into a # want to access it based on the parent id, so map it into a
# dictionary. # dictionary.
@@ -1775,6 +1773,7 @@ class JobJobTasksList(BaseJobEventsList):
if ordering is not None: if ordering is not None:
qs = qs.order_by(ordering) qs = qs.order_by(ordering)
count = 0
for task_start_event in qs: for task_start_event in qs:
# Create initial task data. # Create initial task data.
task_data = { task_data = {
@@ -1825,6 +1824,7 @@ class JobJobTasksList(BaseJobEventsList):
task_data['failed_count'] += child_data['num'] task_data['failed_count'] += child_data['num']
elif child_data['event'] == 'runner_on_no_hosts': elif child_data['event'] == 'runner_on_no_hosts':
task_data['host_count'] += child_data['num'] task_data['host_count'] += child_data['num']
count += 1
results.append(task_data) results.append(task_data)
# Done; return the results and count. # Done; return the results and count.