Merge pull request #4 from hotgluexyz/fix/retries

Fix/retries
hotgluexyz · Feb 5, 2022 · d55d533 · d55d533
2 parents bb6a12d + f2ccf58
commit d55d533
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name="tap-shopify",
-    version="1.4.4",
+    version="1.4.5",
     description="Singer.io tap for extracting Shopify data",
     author="Stitch",
     url="http://github.com/singer-io/tap-shopify",

diff --git a/tap_shopify/streams/base.py b/tap_shopify/streams/base.py
@@ -20,7 +20,7 @@
 DATE_WINDOW_SIZE = 1
 
 # We will retry a 500 error a maximum of 5 times before giving up
-MAX_RETRIES = 5
+MAX_RETRIES = 10
 
 def is_not_status_code_fn(status_code):
     def gen_fn(exc):
@@ -35,7 +35,7 @@ def leaky_bucket_handler(details):
                 details['wait'])
 
 def retry_handler(details):
-    LOGGER.info("Received 500 or retryable error -- Retry %s/%s",
+    LOGGER.info("Received 500 or retryable -- Retry %s/%s",
                 details['tries'], MAX_RETRIES)
 
 #pylint: disable=unused-argument
@@ -54,16 +54,14 @@ def shopify_error_handling(fnc):
     @backoff.on_exception(backoff.expo,
                           (pyactiveresource.connection.ServerError,
                            pyactiveresource.formats.Error,
-                           simplejson.scanner.JSONDecodeError),
-                          giveup=is_not_status_code_fn(range(500, 599)),
+                           simplejson.scanner.JSONDecodeError,
+                           Exception),
                           on_backoff=retry_handler,
                           max_tries=MAX_RETRIES)
     @backoff.on_exception(retry_after_wait_gen,
                           pyactiveresource.connection.ClientError,
                           giveup=is_not_status_code_fn([429]),
-                          on_backoff=leaky_bucket_handler,
-                          # No jitter as we want a constant value
-                          jitter=None)
+                          on_backoff=leaky_bucket_handler)
     @functools.wraps(fnc)
     def wrapper(*args, **kwargs):
         return fnc(*args, **kwargs)