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

Handle json decoder errors from tower inventory source

Browse Source
This commit is contained in:
Matthew Jones
2017-11-06 14:15:20 -05:00
parent 96fbc9ea27
commit 89a05e9bbc
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/plugins/inventory/tower.py
View File

@@ -108,6 +108,8 @@ def read_tower_inventory(tower_host, tower_user, tower_pass, inventory, license_
reason = json_reason.get('detail', 'Retrieving Tower Inventory Failed') reason = json_reason.get('detail', 'Retrieving Tower Inventory Failed')
except requests.ConnectionError, e: except requests.ConnectionError, e:
reason = "Connection to remote host failed: {}".format(e) reason = "Connection to remote host failed: {}".format(e)
except json.JSONDecodeError, e:
reason = "Failed to parse json from host: {}".format(e)
print(reason) print(reason)
sys.exit(1) sys.exit(1)