Skip to content

Commit 310c494

Browse files
author
Francesco Faraone
committed
LITE-28626 reduce default connect timeout and retry also on exceptions (no response)
1 parent c6cda82 commit 310c494

File tree

5 files changed

+474
-393
lines changed

5 files changed

+474
-393
lines changed

connect/client/fluent.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def __init__(
3636
default_limit=100,
3737
max_retries=3,
3838
logger=None,
39-
timeout=(180.0, 180.0),
39+
timeout=(15.0, 180.0),
4040
resourceset_append=True,
4141
):
4242
if default_headers and 'Authorization' in default_headers:

connect/client/mixins.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ def _execute_http_call(self, method, url, kwargs): # noqa: CCR001
102102
self.response = self._session.request(method, url, **kwargs)
103103
if self.logger:
104104
self.logger.log_response(self.response)
105-
except Timeout:
105+
except RequestException:
106106
if retry_count < self.max_retries:
107107
retry_count += 1
108108
time.sleep(1)
@@ -208,18 +208,25 @@ async def _execute_http_call(self, method, url, kwargs):
208208
if self.logger:
209209
self.logger.log_request(method, url, kwargs)
210210

211-
self.response = await self._session.request(method, url, **kwargs)
212-
213-
if self.logger:
214-
self.logger.log_response(self.response)
211+
try:
212+
self.response = await self._session.request(method, url, **kwargs)
215213

214+
if self.logger:
215+
self.logger.log_response(self.response)
216+
except HTTPError:
217+
if retry_count < self.max_retries:
218+
retry_count += 1
219+
time.sleep(1)
220+
continue
221+
raise
216222
if ( # pragma: no branch
217223
self.response.status_code >= 500 and retry_count < self.max_retries
218224
):
219225
retry_count += 1
220226
time.sleep(1)
221227
continue
222228
break # pragma: no cover
229+
223230
if self.response.status_code >= 400:
224231
self.response.raise_for_status()
225232

0 commit comments

Comments
 (0)