fix a bug which breaks inventory update stdout downloads

see: https://github.com/ansible/ansible-tower/issues/7363
see: https://github.com/ansible/ansible-tower/issues/7337
This commit is contained in:
Ryan Petrello
2017-07-31 18:16:19 -04:00
parent 9c29b0a92f
commit d09872d13a

View File

@@ -4382,7 +4382,14 @@ class UnifiedJobStdout(RetrieveAPIView):
tablename, related_name = { tablename, related_name = {
Job: ('main_jobevent', 'job_id'), Job: ('main_jobevent', 'job_id'),
AdHocCommand: ('main_adhoccommandevent', 'ad_hoc_command_id'), AdHocCommand: ('main_adhoccommandevent', 'ad_hoc_command_id'),
}[unified_job.__class__] }.get(unified_job.__class__, (None, None))
if tablename is None:
# stdout job event reconstruction isn't supported
# for certain job types (such as inventory syncs),
# so just grab the raw stdout from the DB
write_fd.write(unified_job.result_stdout_text)
write_fd.close()
else:
cursor.copy_expert( cursor.copy_expert(
"copy (select stdout from {} where {}={} order by start_line) to stdout".format( "copy (select stdout from {} where {}={} order by start_line) to stdout".format(
tablename, tablename,