Catch additional errors in fetch_url

Fixes #8971
2014-09-11 09:46:53 -05:00 · 2014-09-11 09:46:53 -05:00 · e54178f904
commit e54178f904
parent 1dc11c9752
1 changed files with 4 additions and 0 deletions
--- a/lib/ansible/module_utils/urls.py
+++ b/lib/ansible/module_utils/urls.py
@ -445,6 +445,10 @@ def fetch_url(module, url, data=None, headers=None, method=None,
    except urllib2.URLError, e:
        code = int(getattr(e, 'code', -1))
        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