openstack/keystoneauth
Code Issues Proposed changes

Merge "be more explicit about connection errors"

Browse Source
This commit is contained in:
Jenkins 2016-10-13 21:00:28 +00:00 committed by Gerrit Code Review
commit 626886b4aa
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
keystoneauth1/session.py
View File

@ -631,8 +631,14 @@ class Session(object):
except requests.exceptions.Timeout: except requests.exceptions.Timeout:
msg = 'Request to %s timed out' % url msg = 'Request to %s timed out' % url
raise exceptions.ConnectTimeout(msg) raise exceptions.ConnectTimeout(msg)
except requests.exceptions.ConnectionError: except requests.exceptions.ConnectionError as e:
msg = 'Unable to establish connection to %s' % url # NOTE(sdague): urllib3/requests connection error is a
# translation of SocketError. However, SocketError
# happens for many different reasons, and that low
# level message is often really important in figuring
# out the difference between network misconfigurations
# and firewall blocking.
msg = 'Unable to establish connection to %s: %s' % (url, e)
raise exceptions.ConnectFailure(msg) raise exceptions.ConnectFailure(msg)
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e:
msg = 'Unexpected exception for %(url)s: %(error)s' % { msg = 'Unexpected exception for %(url)s: %(error)s' % {