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

Catch additional errors in fetch_url

Browse source 
Fixes #8971
This commit is contained in:
James Cammarata 2014-09-11 09:46:53 -05:00
parent 1dc11c9752
commit e54178f904
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/module_utils/urls.py
View file

@ -445,6 +445,10 @@ def fetch_url(module, url, data=None, headers=None, method=None,
except urllib2.URLError, e: except urllib2.URLError, e:
code = int(getattr(e, 'code', -1)) code = int(getattr(e, 'code', -1))
info.update(dict(msg="Request failed: %s" % str(e), status=code)) info.update(dict(msg="Request failed: %s" % str(e), status=code))
except socket.error, e:
info.update(dict(msg="Connection failure: %s" % str(e), status=-1))
except Exception, e:
info.update(dict(msg="An unknown error occurred: %s" % str(e), status=-1))
return r, info return r, info