Don't retry sending on client errors except 429

Author: Nhi Nguyen

Diff for: analytics/consumer.py

@@ -2,7 +2,7 @@
 from threading import Thread
 
 from analytics.version import VERSION
-from analytics.request import post
+from analytics.request import post, APIError
 
 try:
     from queue import Empty
@@ -80,7 +80,19 @@ def request(self, batch, attempt=0):
         """Attempt to upload the batch and retry before raising an error """
         try:
             post(self.write_key, self.host, batch=batch)
-        except:
-            if attempt > self.retries:
-                raise
-            self.request(batch, attempt+1)
+        except Exception as exc:
+            def maybe_retry():
+                if attempt > self.retries:
+                    raise
+                self.request(batch, attempt+1)
+
+            if isinstance(exc, APIError):
+                if exc.status >= 500 or exc.status == 429:
+                    # retry on server errors and client errors with 429 status code (rate limited)
+                    maybe_retry()
+                elif exc.status >= 400: # don't retry on other client errors
+                    self.log.error('API error: %s', exc)
+                else:
+                    self.log.debug('Unexpected APIError: %s', exc)
+            else: # retry on all other errors (eg. network)
+                maybe_retry()