Skip to content

ENH:Attempt to add timeout to get, put, post #2

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
Dan Allan (danielballan) merged 2 commits into from Jun 1, 2016
Merged

ENH:Attempt to add timeout to get, put, post #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e66e1d
ENH:Attempt to add timeout to get, put, post
May 27, 2016
4f73a12
ENH:Add both connect and read timeouts
Jun 1, 2016
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
12 changes: 6 additions & 6 deletions pyOlog/OlogClient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,28 +94,28 @@ def __init__(self, url=None, username=None, password=None, ask=True):
# self._session.headers.update(self.json_header)
self._session.verify = self.verify

def _get(self, url, **kwargs):
def _get(self, url, timeout=(4.2, 30), **kwargs):
"""Do an http GET request"""
logger.debug("HTTP GET to %s", self._url + url)
kwargs.update({'headers': self.json_header})
resp = self._session.get(self._url + url, **kwargs)
resp = self._session.get(self._url + url, timeout=timeout, stream=False, **kwargs)
resp.raise_for_status()
return resp

def _put(self, url, **kwargs):
def _put(self, url,timeout=(4.2, 30), **kwargs):
"""Do an http put request"""
logger.debug("HTTP PUT to %s", self._url + url)
kwargs.update({'headers': self.json_header})
resp = self._session.put(self._url + url, **kwargs)
resp = self._session.put(self._url + url, timeout=timeout, stream=False, **kwargs)
resp.raise_for_status()
return resp

def _post(self, url, json=True, **kwargs):
def _post(self, url, timeout=(4.2, 30), json=True, **kwargs):
"""Do an http post request"""
logger.debug("HTTP POST to %s", self._url + url)
if json:
kwargs.update({'headers': self.json_header})
resp = self._session.post(self._url + url, **kwargs)
resp = self._session.post(self._url + url, timeout=timeout, stream=False, **kwargs)
resp.raise_for_status()
return resp

Expand Down