Skip to content

Use requests.Session while communicating with Marathon. #121

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.

Sign up for GitHub

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

Merged
solarkennedy merged 1 commit into from
Jun 24, 2016
Merged

Use requests.Session while communicating with Marathon. #121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions marathon/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ def __init__(self, servers, username=None, password=None, timeout=10):
:param str password: Basic auth password
:param int timeout: Timeout (in seconds) for requests to Marathon
"""
self.session = requests.Session()
self.servers = servers if isinstance(servers, list) else [servers]
self.auth = (username, password) if username and password else None
self.timeout = timeout
Expand Down Expand Up @@ -59,8 +60,9 @@ def _do_request(self, method, path, params=None, data=None):
server = servers.pop(0)
url = ''.join([server.rstrip('/'), path])
try:
response = requests.request(method, url, params=params, data=data, headers=headers,
auth=self.auth, timeout=self.timeout)
response = self.session.request(
method, url, params=params, data=data, headers=headers,
auth=self.auth, timeout=self.timeout)
marathon.log.info('Got response from %s', server)
except requests.exceptions.RequestException as e:
marathon.log.error(
Expand Down