Revision f8b42e99
b/kamaki/clients/__init__.py | ||
---|---|---|
135 | 135 |
self.http_client.reset_headers() |
136 | 136 |
self.http_client.reset_params() |
137 | 137 |
errmsg = getattr(err, 'message', unicode(err)) |
138 |
errdetails = getattr(err, 'details', '')+' (%s)'%type(err)
|
|
138 |
errdetails ='%s %s'%(type(err), getattr(err, 'details', ''))
|
|
139 | 139 |
errstatus = getattr(err, 'status', 0) |
140 | 140 |
raise ClientError(message=errmsg,status=errstatus,details=errdetails) |
141 | 141 |
|
b/kamaki/clients/connection/kamakicon.py | ||
---|---|---|
36 | 36 |
from synnefo.lib.pool.http import get_http_connection |
37 | 37 |
from kamaki.clients.connection import HTTPConnection, HTTPResponse, HTTPConnectionError |
38 | 38 |
from gevent.dns import DNSError |
39 |
from socket import gaierror |
|
39 | 40 |
|
40 | 41 |
from json import loads |
41 | 42 |
|
... | ... | |
127 | 128 |
url=str(self.url), |
128 | 129 |
headers=http_headers, |
129 | 130 |
body=data) |
131 |
print('WIIIII') |
|
130 | 132 |
except Exception as err: |
131 | 133 |
conn.close() |
132 |
if isinstance(err, DNSError): |
|
134 |
if isinstance(err, DNSError) or isinstance(err, gaierror):
|
|
133 | 135 |
raise HTTPConnectionError('Cannot connect to %s'%self.url, status=701, |
134 | 136 |
details='%s: %s'%(type(err),unicode(err))) |
135 | 137 |
raise |
Also available in: Unified diff