Remove redundant retries

Author: HardNorth

reportportal_client/client.py

@@ -17,7 +17,7 @@
 import logging
 
 import requests
-from requests.adapters import HTTPAdapter
+from requests.adapters import HTTPAdapter, Retry
 
 from ._local import set_current
 from .core.log_manager import LogManager
@@ -96,10 +96,15 @@ def __init__(self,
         self.step_reporter = StepReporter(self)
         self._item_stack = []
         if retries:
+            retry_strategy = Retry(
+                total=retries,
+                backoff_factor=0.1,
+                status_forcelist=[429, 500, 502, 503, 504]
+            )
             self.session.mount('https://', HTTPAdapter(
-                max_retries=retries, pool_maxsize=max_pool_size))
+                max_retries=retry_strategy, pool_maxsize=max_pool_size))
             self.session.mount('http://', HTTPAdapter(
-                max_retries=retries, pool_maxsize=max_pool_size))
+                max_retries=retry_strategy, pool_maxsize=max_pool_size))
         self.session.headers['Authorization'] = 'bearer {0}'.format(self.token)
 
         self._log_manager = LogManager(

reportportal_client/core/rp_requests.py

@@ -33,8 +33,7 @@
 from reportportal_client.static.defines import (
     DEFAULT_PRIORITY,
     LOW_PRIORITY,
-    RP_LOG_LEVELS,
-    SEND_RETRY_COUNT
+    RP_LOG_LEVELS
 )
 from .rp_responses import RPResponse
 
@@ -71,24 +70,19 @@ def __init__(self, session_method, url, data=None, json=None,
 
     def make(self):
         """Make HTTP request to the Report Portal API."""
-        exceptions = []
-        for attempt in range(SEND_RETRY_COUNT):
-            try:
-                return RPResponse(self.session_method(
-                    self.url, data=self.data, json=self.json,
-                    files=self.files, verify=self.verify_ssl,
-                    timeout=self.http_timeout)
-                )
+        try:
+            return RPResponse(self.session_method(
+                self.url, data=self.data, json=self.json,
+                files=self.files, verify=self.verify_ssl,
+                timeout=self.http_timeout)
+            )
             # https://github.com/reportportal/client-Python/issues/39
-            except (KeyError, IOError, ValueError) as exc:
-                exceptions.append(exc)
-
-        logger.warning(
-            "Report Portal %s request failed after %d attempts",
-            self.name,
-            SEND_RETRY_COUNT,
-            exc_info=exceptions[-1]
-        )
+        except (KeyError, IOError, ValueError) as exc:
+            logger.warning(
+                "Report Portal %s request failed",
+                self.name,
+                exc_info=exc
+            )
 
 
 class RPRequestBase(object):

reportportal_client/static/defines.py

@@ -83,4 +83,3 @@ class Priority(enum.IntEnum):
 LOW_PRIORITY = Priority.PRIORITY_LOW
 NOT_FOUND = _PresenceSentinel()
 NOT_SET = _PresenceSentinel()
-SEND_RETRY_COUNT = 10