summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Schultz <aschultz@redhat.com>2019-08-01 14:39:46 -0600
committerAlex Schultz <aschultz@redhat.com>2019-08-01 14:41:29 -0600
commit436f797e8db2fc11b7dace7cb7020e4d44a3d2d7 (patch)
tree0103bb599d30575f2b9c3a770f4eee596d082588
parent31f2fdae9481c7fd840219887c27d6f696f819ab (diff)
downloadpython-glanceclient-436f797e8db2fc11b7dace7cb7020e4d44a3d2d7.tar.gz
Cleanup session object
If a session object is not provided to the get_http_client function (as is done via osc), the glance client uses it's own HTTPClient class. This class creates a session but does not properly close it when it is done. This can lead to resource warnings about unclosed sockets. This change adds a __del__() to the HTTPClient class to close out the session correctly. Change-Id: Idccff338fa84c46ca0e429bb533a2a5217205eef Closes-Bug: #1838694
-rw-r--r--glanceclient/common/http.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/glanceclient/common/http.py b/glanceclient/common/http.py
index 17d7cc7..78c4bc5 100644
--- a/glanceclient/common/http.py
+++ b/glanceclient/common/http.py
@@ -183,6 +183,15 @@ class HTTPClient(_BaseHTTPClient):
self.session.cert = (kwargs.get('cert_file'),
kwargs.get('key_file'))
+ def __del__(self):
+ if self.session:
+ try:
+ self.session.close()
+ except Exception as e:
+ LOG.exception(e)
+ finally:
+ self.session = None
+
@staticmethod
def parse_endpoint(endpoint):
return netutils.urlsplit(endpoint)