From 9f67b6742c8fa8b0b1198c45a257f5bd41e82a94 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 24 Jul 2020 14:01:48 -0400 Subject: [PATCH] Fail more gracefully if analytics.ship() is called with a bad path, or it's deleted out from under us. --- awx/main/analytics/core.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/awx/main/analytics/core.py b/awx/main/analytics/core.py index 3e60c449e4..98fa8369d8 100644 --- a/awx/main/analytics/core.py +++ b/awx/main/analytics/core.py @@ -191,6 +191,9 @@ def ship(path): if not path: logger.error('Automation Analytics TAR not found') return + if not os.path.exists(path): + logger.error('Automation Analytics TAR {} not found'.format(path)) + return if "Error:" in str(path): return try: @@ -223,4 +226,5 @@ def ship(path): response.text)) finally: # cleanup tar.gz - os.remove(path) + if os.path.exists(path): + os.remove(path)