Merge branch 'master' into feature/FAM-1291

Ivan Kovalkovskyi · Ivan Kovalkovskyi · commit 8ff6c55c55d6 · 2017-11-03T16:32:58.000+02:00
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -242,6 +242,7 @@ def request(self, url, method='GET', params=None, data=None,
         # Try to send the request more than once by default (see #103)
         retry = True
         _try = 0
+        _last_exc = None
         while retry:
             try:
                 response = self._session.request(
@@ -256,12 +257,15 @@ def request(self, url, method='GET', params=None, data=None,
                     timeout=self._timeout
                 )
                 break
-            except requests.exceptions.ConnectionError:
+            except requests.exceptions.ConnectionError as e:
+                _last_exc = e
                 _try += 1
                 if self._retries != 0:
                     retry = _try < self._retries
 
         else:
+            if _last_exc:
+                raise _last_exc
             raise requests.exceptions.ConnectionError
 
         if 500 <= response.status_code < 600:
