cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Meraki module utility request() has improved error reporting (#39838)

Browse source 
* request() has improved error reporting
- 5xx errors show same as before
- 3xx and 4xx errors show error body

* Print body for errors greater than 300, but less than 500

* Remove trailing whitespace
This commit is contained in:
Kevin Breit 2018-07-02 03:42:50 -05:00 committed by Dag Wieers
parent 61d5454737
commit dd31dcab70
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/module_utils/network/meraki/meraki.py
View file

@ -259,8 +259,11 @@ class MerakiModule(object):
self.response = info['msg'] self.response = info['msg']
self.status = info['status'] self.status = info['status']
if self.status >= 300: if self.status >= 500:
self.fail_json(msg='Request failed for {url}: {status} - {msg}'.format(**info)) self.fail_json(msg='Request failed for {url}: {status} - {msg}'.format(**info))
elif self.status >= 300:
self.fail_json(msg='Request failed for {url}: {status} - {msg}'.format(**info),
body=json.loads(to_native(info['body'])))
try: try:
return json.loads(to_native(resp.read())) return json.loads(to_native(resp.read()))
except: except: