Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix http leak #272

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 14 additions & 12 deletions datadog/api/http_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
# 3p
try:
import requests
import requests.adapters
except ImportError:
requests = None

Expand Down Expand Up @@ -64,19 +65,20 @@ class RequestClient(HTTPClient):
def request(cls, method, url, headers, params, data, timeout, proxies, verify, max_retries):
"""
"""
# Use a session to set a max_retries parameters
s = requests.Session()
http_adapter = requests.adapters.HTTPAdapter(max_retries=max_retries)
s.mount('https://', http_adapter)

try:
result = s.request(
method, url,
headers=headers, params=params, data=data,
timeout=timeout,
proxies=proxies, verify=verify)

result.raise_for_status()
# Use a session to set a max_retries parameters
with requests.Session() as s:
http_adapter = requests.adapters.HTTPAdapter(max_retries=max_retries)
s.mount('https://', http_adapter)

# Since stream=False we can close the session after this call
result = s.request(
method, url,
headers=headers, params=params, data=data,
timeout=timeout,
proxies=proxies, verify=verify)

result.raise_for_status()

except requests.ConnectionError as e:
raise _remove_context(ClientError(method, url, e))
Expand Down