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

fix a bug which can cause isolated artifact cleanup to fail

Browse Source 
see: https://github.com/ansible/awx/issues/4376
This commit is contained in:
Ryan Petrello
2019-07-25 15:44:13 -04:00
parent 24b166aec9
commit 2608e8d47d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/plugins/isolated/awx_isolated_cleanup.py
View File

@@ -51,9 +51,11 @@ def main():
try: try:
re_match = re.match(r'\/tmp\/awx_\d+_.+', path) re_match = re.match(r'\/tmp\/awx_\d+_.+', path)
if re_match is not None: if re_match is not None:
if subprocess.check_call(['ansible-runner', 'is-alive', path]) == 0: try:
continue if subprocess.check_call(['ansible-runner', 'is-alive', path]) == 0:
else: continue
except subprocess.CalledProcessError:
# the job isn't running anymore, clean up this path
module.debug('Deleting path {} its job has completed.'.format(path)) module.debug('Deleting path {} its job has completed.'.format(path))
except (ValueError, IndexError): except (ValueError, IndexError):
continue continue