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

Merge pull request #60 from ansible/timing-issue

Browse Source 
Address IOError 500
This commit is contained in:
Matthew Jones
2015-02-03 14:13:21 -05:00
parent 3d07e09aeb 67bf4c9cf8
commit ac7eeb7bd3
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -601,7 +601,7 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
pass pass
super(UnifiedJob, self).delete() super(UnifiedJob, self).delete()
def result_stdout_raw_handle(self): def result_stdout_raw_handle(self, attempt=0):
"""Return a file-like object containing the standard out of the """Return a file-like object containing the standard out of the
job's result. job's result.
""" """
@@ -610,7 +610,23 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
else: else:
if not os.path.exists(self.result_stdout_file): if not os.path.exists(self.result_stdout_file):
return StringIO("stdout capture is missing") return StringIO("stdout capture is missing")
return codecs.open(self.result_stdout_file, "r", encoding='utf-8')
# There is a potential timing issue here, because another
# process may be deleting the stdout file after it is written
# to the database.
#
# Therefore, if we get an IOError (which generally means the
# file does not exist), reload info from the database and
# try again.
try:
return codecs.open(self.result_stdout_file, "r",
encoding='utf-8')
except IOError:
if attempt < 3:
self.result_stdout_text = type(self).objects.get(id=self.id).result_stdout_text
return self.result_stdout_raw_handle(attempt=attempt + 1)
else:
return StringIO("stdout capture is missing")
@property @property
def result_stdout_raw(self): def result_stdout_raw(self):