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

Fail more gracefully if analytics.ship() is called with a bad path,

Browse Source 
or it's deleted out from under us.
This commit is contained in:
Bill Nottingham
2020-07-24 14:01:48 -04:00
parent 1a15f18be3
commit 9f67b6742c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/analytics/core.py
View File

@@ -191,6 +191,9 @@ def ship(path):
if not path: if not path:
logger.error('Automation Analytics TAR not found') logger.error('Automation Analytics TAR not found')
return return
if not os.path.exists(path):
logger.error('Automation Analytics TAR {} not found'.format(path))
return
if "Error:" in str(path): if "Error:" in str(path):
return return
try: try:
@@ -223,4 +226,5 @@ def ship(path):
response.text)) response.text))
finally: finally:
# cleanup tar.gz # cleanup tar.gz
os.remove(path) if os.path.exists(path):
os.remove(path)