Merge branch 'feature/retry' into develop

sbg · Oct 28, 2020 · 0654fe6 · 0654fe6
2 parents 4960e31 + 94badfc
commit 0654fe6
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/sevenbridges/http/client.py b/sevenbridges/http/client.py
@@ -281,8 +281,20 @@ def _request(self, verb, url, headers=None, params=None, data=None,
                 verb, url, params=params, stream=stream, allow_redirects=True,
             )
         if self.error_handlers:
-            for error_handler in self.error_handlers:
-                response = error_handler(self, response)
+            while True:
+                for error_handler in self.error_handlers:
+                    handled_response = error_handler(self, response)
+                    # if error handler 'is_repeatable', and error handling
+                    # occurred, iterate again
+                    if hasattr(error_handler, 'is_repeatable'):
+                        if response != handled_response:
+                            response = handled_response
+                            break
+                    else:
+                        response = handled_response
+                else:
+                    break
+
         headers = response.headers
         self._limit = headers.get('X-RateLimit-Limit', self._limit)
         self._remaining = headers.get('X-RateLimit-Remaining', self._remaining)

diff --git a/sevenbridges/http/error_handlers.py b/sevenbridges/http/error_handlers.py
@@ -11,6 +11,16 @@
 logger = logging.getLogger(__name__)
 
 
+def repeatable_handler(f):
+    """
+    Marks 'repeatable' error handlers. Error handler is repeatable if propagate
+    input response in case of no error handling occurred.
+    """
+    f.is_repeatable = True
+    return f
+
+
+@repeatable_handler
 @retry_on_excs(excs=(HTTPError, UrlLibHTTPError))
 def rate_limit_sleeper(api, response):
     """
@@ -31,6 +41,7 @@ def rate_limit_sleeper(api, response):
     return response
 
 
+@repeatable_handler
 @retry_on_excs(excs=(HTTPError, UrlLibHTTPError, JSONDecodeError))
 def maintenance_sleeper(api, response, sleep=300):
     """
@@ -58,6 +69,7 @@ def maintenance_sleeper(api, response, sleep=300):
     return response
 
 
+@repeatable_handler
 @retry_on_excs(excs=(HTTPError, UrlLibHTTPError))
 def general_error_sleeper(api, response, sleep=300):
     """