added exception handling to send

Author: PraneethChandraThota

socketlabs/injectionapi/core/httprequest.py

@@ -159,11 +159,11 @@ def send_request(self, request: InjectionRequest):
         connection.request("POST", self._endpoint.url, json_body, headers)
         response = connection.getresponse()
 
-        data = response.read().decode("utf-8")
-        response_code = response.status
+        # data = response.read().decode("utf-8")
+        # response_code = response.status
 
-        result = InjectionResponseParser.parse(data, response_code)
-        return result
+        # result = InjectionResponseParser.parse(data, response_code)
+        return response
 
     def __get_connection(self):
         """

socketlabs/injectionapi/core/retryhandler.py

@@ -1,6 +1,11 @@
 from http import HTTPStatus
 from ..retrysettings import RetrySettings
 from .httprequest import HttpRequest
+from .injectionresponseparser import InjectionResponseParser
+import sys
+import socket
+import time
+
 class RetryHandler(object):
 
     ErrorStatusCodes = [
@@ -11,7 +16,7 @@ class RetryHandler(object):
     ]
 
     def __init__(self, http_client: HttpRequest, settings: RetrySettings):
-        
+
         self.__http_client = http_client
         self.__retry_settings = settings
 
@@ -21,5 +26,25 @@ def send(self, body):
             return self.__http_client.send_request(body)
 
         attempts = 0
+        while True:
+            wait_interval = self.__retry_settings.get_next_wait_interval(attempts)
+
+            try:
+                response = self.__http_client.send_request(body)
+
+                if response.status in self.ErrorStatusCodes:
+                    raise Exception("Server Error")
+                
+                data = response.read().decode("utf-8")
+                response_code = response.status
+                result = InjectionResponseParser.parse(data, response_code)
 
-        return
+                return result
+            
+            except socket.timeout:
+                attempts += 1
+                print("Retry Attempt : ", sys.exc_info()[0])
+                if attempts > self.__retry_settings.maximum_number_of_retries:
+                    raise socket.timeout
+                time.sleep(wait_interval.seconds)
+            

socketlabs/injectionapi/retrysettings.py

@@ -13,10 +13,10 @@ def __init__(self, maximum_retries = None):
         if maximum_retries:
 
             if maximum_retries < 0:
-                raise ValueError("maximumNumberOfRetries must be greater than 0")
+                raise AttributeError("maximumNumberOfRetries must be greater than 0")
 
             if maximum_retries > self.__maximum_allowed_number_of_retries:
-                raise ValueError("The maximum number of allowed retries is ", self.__maximum_allowed_number_of_retries)
+                raise AttributeError("The maximum number of allowed retries is ", self.__maximum_allowed_number_of_retries)
 
             self.__maximum_number_of_retries = maximum_retries