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

better error handling

Browse Source
This commit is contained in:
Chris Meyers
2015-04-20 17:15:03 -04:00
parent f2b58af125
commit 1df51f3c48
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/management/commands/inventory_import.py
View File

@@ -357,8 +357,9 @@ class ExecutableJsonLoader(BaseLoader):
stdout, stderr = proc.communicate() stdout, stderr = proc.communicate()
if proc.returncode != 0: if proc.returncode != 0:
raise RuntimeError('%r failed (rc=%d) with output: %s' % (cmd, proc.returncode, stderr)) raise RuntimeError('%r failed (rc=%d) with output: %s' % (cmd, proc.returncode, stderr))
data = json.loads(stdout) try:
if not isinstance(data, dict): data = json.loads(stdout)
except ValueError:
raise TypeError('Returned JSON must be a dictionary, got %s instead' % str(type(data))) raise TypeError('Returned JSON must be a dictionary, got %s instead' % str(type(data)))
except: except:
logger.error('Failed to load JSON from: %s', stdout) logger.error('Failed to load JSON from: %s', stdout)