Merge pull request #178 from Helene/reuse_requests_session

Improve performance by reducing client request threads

Author: Helene

source/queryHandler/PerfmonRESTclient.py

@@ -39,6 +39,21 @@
 DEFAULT_HEADERS = {"Accept": "application/json",
                    "Content-type": "application/json"}
 
+session = None
+
+
+def get_session():
+    global session
+    if not session:
+        session = requests.Session()
+    return session
+
+
+def close_session():
+    global session
+    if session:
+        session.close()
+
 
 def getAuthHandler(keyName, keyValue):
     if not isinstance(keyName, bytes):
@@ -80,28 +95,33 @@ class perfHTTPrequestHelper(object):
     2. waits until  the server response, finally forwards a result to the QueryHandler
     """
 
-    def __init__(self, logger, reqdata=None, session=None):
-        self.session = session or requests.Session()
+    def __init__(self, logger, reqdata=None, caCert=False):
+        self.session = get_session()
+        self.caCert = caCert
         self.requestData = reqdata
         self.logger = logger
 
     @cond_execution_time(enabled=analytics.inspect)
     def doRequest(self):
         if self.requestData and isinstance(self.requestData, requests.Request):
+            self.session.verify = self.caCert
             _prepRequest = self.session.prepare_request(self.requestData)
             try:
                 res = self.session.send(_prepRequest)
                 return res
             except requests.exceptions.ConnectionError:
+                close_session()
                 res = requests.Response()
                 res.status_code = 503
                 res.reason = "Connection refused from server"
                 return res
             except requests.exceptions.RequestException as e:
+                close_session()
                 self.logger.debug('doRequest __ RequestException. Request data: {}, Response data: {}'.format(e.request, e.response))
                 res = requests.Response()
                 res.status_code = 404
                 res.reason = "The request could not be processed from server"
                 return res
         else:
+            close_session()
             raise TypeError('doRequest __ Error: request data wrong format')

source/queryHandler/QueryHandler.py

@@ -513,9 +513,12 @@ def __do_RESTCall(self, endpoint, requestType='GET', params=None):
 
         try:
             _auth = getAuthHandler(*self.apiKeyData)
-            _reqData = createRequestDataObj(self.logger, requestType, endpoint, self.server, self.port, auth=_auth, params=params)
-            _request = perfHTTPrequestHelper(self.logger, reqdata=_reqData)
-            _request.session.verify = self.caCert
+            _reqData = createRequestDataObj(self.logger, requestType, endpoint,
+                                            self.server, self.port, auth=_auth,
+                                            params=params)
+            _request = perfHTTPrequestHelper(self.logger,
+                                             reqdata=_reqData,
+                                             caCert=self.caCert)
             _response = _request.doRequest()
 
             if _response.status_code == 200: