From 1e66e1d08c19438fab266e6a8cdbdfa05561400e Mon Sep 17 00:00:00 2001 From: arkilic Date: Fri, 27 May 2016 16:44:36 -0400 Subject: [PATCH 1/2] ENH:Attempt to add timeout to get, put, post --- pyOlog/OlogClient.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pyOlog/OlogClient.py b/pyOlog/OlogClient.py index 8e4165f..49ab1dd 100644 --- a/pyOlog/OlogClient.py +++ b/pyOlog/OlogClient.py @@ -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=2, **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, **kwargs) resp.raise_for_status() return resp - def _put(self, url, **kwargs): + def _put(self, url, timeout=2,**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, **kwargs) resp.raise_for_status() return resp - def _post(self, url, json=True, **kwargs): + def _post(self, url, timeout=2, 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, **kwargs) resp.raise_for_status() return resp From 4f73a120655755d32bb8d8fe6b4f5ce812413553 Mon Sep 17 00:00:00 2001 From: arkilic Date: Tue, 31 May 2016 22:37:22 -0400 Subject: [PATCH 2/2] ENH:Add both connect and read timeouts --- pyOlog/OlogClient.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pyOlog/OlogClient.py b/pyOlog/OlogClient.py index 49ab1dd..ed703e6 100644 --- a/pyOlog/OlogClient.py +++ b/pyOlog/OlogClient.py @@ -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, timeout=2, **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, timeout=timeout, **kwargs) + resp = self._session.get(self._url + url, timeout=timeout, stream=False, **kwargs) resp.raise_for_status() return resp - def _put(self, url, timeout=2,**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, timeout=timeout, **kwargs) + resp = self._session.put(self._url + url, timeout=timeout, stream=False, **kwargs) resp.raise_for_status() return resp - def _post(self, url, timeout=2, 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, timeout=timeout, **kwargs) + resp = self._session.post(self._url + url, timeout=timeout, stream=False, **kwargs) resp.raise_for_status() return resp