Cleanup session objecttrain-em2.17.1stable/train

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
(cherry picked from commit 436f797e8db2fc11b7dace7cb7020e4d44a3d2d7)

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)