Skip to content

add timeout to client #15

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

Open
rule88 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add timeout to client #15

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
12 changes: 7 additions & 5 deletions rancher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ class ClientApiError(Exception):
class Client(object):
def __init__(self, access_key=None, secret_key=None, url=None, cache=False,
cache_time=86400, strict=False, headers=None, token=None,
verify=True, **kw):
verify=True, timeout=None, **kw):
if verify == 'False':
verify = False
self._headers = HEADERS.copy()
Expand All @@ -206,6 +206,7 @@ def __init__(self, access_key=None, secret_key=None, url=None, cache=False,
self.schema = None
self._session = requests.Session()
self._session.verify = verify
self.timeout = timeout

if not self._cache_time:
self._cache_time = 60 * 60 * 24 # 24 Hours
Expand Down Expand Up @@ -278,7 +279,7 @@ def _get_raw(self, url, data=None):

def _get_response(self, url, data=None):
r = self._session.get(url, auth=self._auth, params=data,
headers=self._headers)
headers=self._headers, timeout=self.timeout)
if r.status_code < 200 or r.status_code >= 300:
self._error(r.text)

Expand All @@ -287,7 +288,7 @@ def _get_response(self, url, data=None):
@timed_url
def _post(self, url, data=None):
r = self._session.post(url, auth=self._auth, data=self._marshall(data),
headers=self._headers)
headers=self._headers, timeout=self.timeout)
if r.status_code < 200 or r.status_code >= 300:
self._error(r.text)

Expand All @@ -296,15 +297,16 @@ def _post(self, url, data=None):
@timed_url
def _put(self, url, data=None):
r = self._session.put(url, auth=self._auth, data=self._marshall(data),
headers=self._headers)
headers=self._headers, timeout=self.timeout)
if r.status_code < 200 or r.status_code >= 300:
self._error(r.text)

return self._unmarshall(r.text)

@timed_url
def _delete(self, url):
r = self._session.delete(url, auth=self._auth, headers=self._headers)
r = self._session.delete(url, auth=self._auth, headers=self._headers,
timeout=self.timeout)
if r.status_code < 200 or r.status_code >= 300:
self._error(r.text)

Expand Down