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

more gracefully handle fact cache failures for hosts that contain /

Browse Source 
see: https://github.com/ansible/awx/issues/1977
related: https://github.com/ansible/ansible/issues/41413
This commit is contained in:
Ryan Petrello
2018-06-11 15:01:46 -04:00
parent ab4271b36d
commit d0d7bf5c21
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/main/models/jobs.py
View File

@@ -774,9 +774,13 @@ class Job(UnifiedJob, JobOptions, SurveyJobMixin, JobNotificationMixin, TaskMana
if not os.path.realpath(filepath).startswith(destination): if not os.path.realpath(filepath).startswith(destination):
system_tracking_logger.error('facts for host {} could not be cached'.format(smart_str(host.name))) system_tracking_logger.error('facts for host {} could not be cached'.format(smart_str(host.name)))
continue continue
with codecs.open(filepath, 'w', encoding='utf-8') as f: try:
os.chmod(f.name, 0o600) with codecs.open(filepath, 'w', encoding='utf-8') as f:
json.dump(host.ansible_facts, f) os.chmod(f.name, 0o600)
json.dump(host.ansible_facts, f)
except IOError:
system_tracking_logger.error('facts for host {} could not be cached'.format(smart_str(host.name)))
continue
# make note of the time we wrote the file so we can check if it changed later # make note of the time we wrote the file so we can check if it changed later
modification_times[filepath] = os.path.getmtime(filepath) modification_times[filepath] = os.path.getmtime(filepath)