Allow user-configurable number of retries when submitting request to database

xginn8 · xginn8 · commit 194ef13cf802 · 2017-04-09T21:59:09.000-04:00
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -53,6 +53,9 @@ class InfluxDBClient(object):
     :param timeout: number of seconds Requests will wait for your client to
         establish a connection, defaults to None
     :type timeout: int
+    :param retries: number of retries your client will try before aborting,
+        defaults to 3. 0 indicates try until success
+    :type retries: int
     :param use_udp: use UDP to connect to InfluxDB, defaults to False
     :type use_udp: bool
     :param udp_port: UDP port to connect to InfluxDB, defaults to 4444
@@ -70,6 +73,7 @@ def __init__(self,
                  ssl=False,
                  verify_ssl=False,
                  timeout=None,
+                 retries=3,
                  use_udp=False,
                  udp_port=4444,
                  proxies=None,
@@ -81,6 +85,7 @@ def __init__(self,
         self._password = password
         self._database = database
         self._timeout = timeout
+        self._retries = retries
 
         self._verify_ssl = verify_ssl
 
@@ -225,9 +230,10 @@ def request(self, url, method='GET', params=None, data=None,
         if isinstance(data, (dict, list)):
             data = json.dumps(data)
 
-        # Try to send the request a maximum of three times. (see #103)
-        # TODO (aviau): Make this configurable.
-        for i in range(0, 3):
+        # Try to send the request more than once by default (see #103)
+        retry = True
+        _try = 0
+        while retry:
             try:
                 response = self._session.request(
                     method=method,
@@ -242,10 +248,9 @@ def request(self, url, method='GET', params=None, data=None,
                 )
                 break
             except requests.exceptions.ConnectionError as e:
-                if i < 2:
-                    continue
-                else:
-                    raise e
+                _try += 1
+                if self._retries != 0:
+                    retry = _try < self._retries
 
         if 500 <= response.status_code < 600:
             raise InfluxDBServerError(response.content)
diff --git a/influxdb/influxdb08/client.py b/influxdb/influxdb08/client.py
@@ -55,6 +55,9 @@ class InfluxDBClient(object):
     :param verify_ssl: verify SSL certificates for HTTPS requests, defaults is
         False
     :type verify_ssl: boolean
+    :param retries: number of retries your client will try before aborting,
+        defaults to 3. 0 indicates try until success
+    :type retries: int
     :param timeout: number of seconds Requests will wait for your client to
         establish a connection, defaults to None
     :type timeout: int
@@ -73,6 +76,7 @@ def __init__(self,
                  ssl=False,
                  verify_ssl=False,
                  timeout=None,
+                 retries=3,
                  use_udp=False,
                  udp_port=4444):
         """
@@ -84,6 +88,7 @@ def __init__(self,
         self._password = password
         self._database = database
         self._timeout = timeout
+        self._retries = retries
 
         self._verify_ssl = verify_ssl
 
@@ -228,10 +233,11 @@ def request(self, url, method='GET', params=None, data=None,
         if data is not None and not isinstance(data, str):
             data = json.dumps(data)
 
-        # Try to send the request a maximum of three times. (see #103)
-        # TODO (aviau): Make this configurable.
-        for i in range(0, 3):
-            try:
+        retry = True
+        _try = 0
+        # Try to send the request more than once by default (see #103)
+        while retry:
+             try:
                 response = session.request(
                     method=method,
                     url=url,
@@ -244,10 +250,9 @@ def request(self, url, method='GET', params=None, data=None,
                 break
             except (requests.exceptions.ConnectionError,
                     requests.exceptions.Timeout) as e:
-                if i < 2:
-                    continue
-                else:
-                    raise e
+                _try += 1
+                if self._retries != 0:
+                    retry = _try < self._retries
 
         if response.status_code == expected_response_code:
             return response
