womax/python-glanceclient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix failure to create glance https connection pool"

Browse Source
This commit is contained in:
Jenkins
2015-07-29 20:39:37 +00:00
committed by Gerrit Code Review
parent ec0f2dfd85 c41dcc9f43
commit 4712765689
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glanceclient/common/https.py
+4 -3
View File
@@ -160,15 +160,16 @@ class HTTPSAdapter(adapters.HTTPAdapter):
return url
def _create_glance_httpsconnectionpool(self, url):
kw = self.poolmanager.connection_kw
kw = self.poolmanager.connection_pool_kw
# Parse the url to get the scheme, host, and port
parsed = compat.urlparse(url)
# If there is no port specified, we should use the standard HTTPS port
port = parsed.port or 443
pool = HTTPSConnectionPool(parsed.host, port, **kw)
host = parsed.netloc.rsplit(':', 1)[0]
pool = HTTPSConnectionPool(host, port, **kw)
with self.poolmanager.pools.lock:
self.poolmanager.pools[(parsed.scheme, parsed.host, port)] = pool
self.poolmanager.pools[(parsed.scheme, host, port)] = pool
return pool