25
25
26
26
RETRY_AFTER_STATUS_CODES = frozenset ([429 , 500 , 501 , 502 , 503 , 504 , 505 , 506 , 507 , 509 , 510 , 511 , 512 ])
27
27
RETRY_ALLOWED_METHODS = frozenset (["GET" , "PUT" , "DELETE" , "POST" , "PATCH" ])
28
- # apply sane default for calls to datadog API which has 60s timeout
29
- DEFAULT_TIMEOUT = 55
30
- DEFAULT_IDLE_CONN_MS = 55000
31
28
32
29
33
30
class ClientRetry (urllib3 .util .Retry ):
@@ -143,7 +140,7 @@ def request(
143
140
post_params = post_params or {}
144
141
headers = headers or {}
145
142
146
- timeout = urllib3 . Timeout ( total = DEFAULT_TIMEOUT )
143
+ timeout = None
147
144
if request_timeout :
148
145
if isinstance (request_timeout , (int , float )):
149
146
timeout = urllib3 .Timeout (total = request_timeout )
@@ -243,13 +240,7 @@ def __init__(self, configuration):
243
240
proxy = None
244
241
if configuration .proxy :
245
242
proxy = aiosonic .Proxy (configuration .proxy , configuration .proxy_headers )
246
- pool_configs = {
247
- ":default" : aiosonic .PoolConfig (
248
- max_conn_idle_ms = DEFAULT_IDLE_CONN_MS
249
- )
250
- }
251
- connector = aiosonic .TCPConnector (pool_configs = pool_configs )
252
- self ._client = aiosonic .HTTPClient (connector = connector , proxy = proxy , verify_ssl = configuration .verify_ssl )
243
+ self ._client = aiosonic .HTTPClient (proxy = proxy , verify_ssl = configuration .verify_ssl )
253
244
self ._configuration = configuration
254
245
255
246
def close (self ):
@@ -299,13 +290,13 @@ async def request(
299
290
(connection, read) timeouts.
300
291
"""
301
292
assert not post_params , "not supported for now"
302
- from aiosonic .timeout import Timeouts # type: ignore
303
- timeout = Timeouts (request_timeout = DEFAULT_TIMEOUT )
304
293
if request_timeout is not None :
294
+ from aiosonic .timeout import Timeouts # type: ignore
295
+
305
296
if isinstance (request_timeout , (int , float )):
306
- timeout = Timeouts (request_timeout = request_timeout )
297
+ request_timeout = Timeouts (request_timeout = request_timeout )
307
298
else :
308
- timeout = Timeouts (sock_connect = request_timeout [0 ], sock_read = request_timeout [1 ])
299
+ request_timeout = Timeouts (sock_connect = request_timeout [0 ], sock_read = request_timeout [1 ])
309
300
request_body = None
310
301
if (
311
302
"Content-Type" not in headers
@@ -326,7 +317,7 @@ async def request(
326
317
counter = 0
327
318
while True :
328
319
response = await self ._client .request (
329
- url , method , headers , query_params , request_body , timeouts = timeout
320
+ url , method , headers , query_params , request_body , timeouts = request_timeout
330
321
)
331
322
retry = self ._retry (method , response , counter )
332
323
if not retry :
0 commit comments