|
@@ -127,10 +127,10 @@ def massage_job_for_json(job, request):
|
|
|
'cleanupProgress': hasattr(job, 'cleanupProgress') and job.cleanupProgress or '',
|
|
'cleanupProgress': hasattr(job, 'cleanupProgress') and job.cleanupProgress or '',
|
|
|
'desiredMaps': job.desiredMaps,
|
|
'desiredMaps': job.desiredMaps,
|
|
|
'desiredReduces': job.desiredReduces,
|
|
'desiredReduces': job.desiredReduces,
|
|
|
- 'mapsPercentComplete': int(job.maps_percent_complete),
|
|
|
|
|
|
|
+ 'mapsPercentComplete': int(job.maps_percent_complete) if job.maps_percent_complete else '',
|
|
|
'finishedMaps': job.finishedMaps,
|
|
'finishedMaps': job.finishedMaps,
|
|
|
'finishedReduces': job.finishedReduces,
|
|
'finishedReduces': job.finishedReduces,
|
|
|
- 'reducesPercentComplete': int(job.reduces_percent_complete),
|
|
|
|
|
|
|
+ 'reducesPercentComplete': int(job.reduces_percent_complete) if job.reduces_percent_complete else '',
|
|
|
'jobFile': hasattr(job, 'jobFile') and job.jobFile or '',
|
|
'jobFile': hasattr(job, 'jobFile') and job.jobFile or '',
|
|
|
'launchTimeMs': hasattr(job, 'launchTimeMs') and job.launchTimeMs or '',
|
|
'launchTimeMs': hasattr(job, 'launchTimeMs') and job.launchTimeMs or '',
|
|
|
'launchTimeFormatted': hasattr(job, 'launchTimeFormatted') and job.launchTimeFormatted or '',
|
|
'launchTimeFormatted': hasattr(job, 'launchTimeFormatted') and job.launchTimeFormatted or '',
|