FAELIX/fulcrmpy
FAELIX/fulcrmpy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

error handling and timeouts

Browse Source
This commit is contained in:
Marek Isalski 2018-06-19 18:02:46 +02:00
parent ece9a3e86a
commit b469be7dbb
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fulcrmpy/apiv2.py
View File

@ -29,6 +29,8 @@ class APIv2( object ):
if not path.startswith( "/" ):
path = "/" + path
path = self.api_path + path
if not path.endswith( "/" ):
path = path + "/"
return path
def normalize_url( self, url, no_d = False, query = None ):
@ -58,6 +60,26 @@ class APIv2( object ):
new_url = urlqueryparse.set_query_fields( url, new_query )
return new_url
def get( self, url, query = None, _countdown = 5 ):
url = self.normalize_url( url, query = query )
return self.make_request( url, data = None, method = 'GET', _countdown = _countdown )
def post( self, url, data, query = None, _countdown = 5 ):
url = self.normalize_url( url, query = query )
return self.make_request( url, data = data, method = 'POST', _countdown = _countdown )
def patch( self, url, data, query = None, _countdown = 5 ):
url = self.normalize_url( url, query = query )
return self.make_request( url, data = data, method = 'PATCH', _countdown = _countdown )
def put( self, url, data, query = None, _countdown = 5 ):
url = self.normalize_url( url, query = query )
return self.make_request( url, data = data, method = 'PUT', _countdown = _countdown )
def delete( self, url, query = None, _countdown = 5 ):
url = self.normalize_url( url, query = query )
return self.make_request( url, data = None, method = 'DELETE', _countdown = _countdown )
def make_request( self, url, data, method, _countdown = 5 ):
method = { 'POST': requests.post,
'PATCH': requests.patch,
@ -67,9 +89,9 @@ class APIv2( object ):
try:
if data:
request = method( url, data = json.dumps( data ), auth = self.auth )
request = method( url, data = json.dumps( data ), auth = self.auth, timeout = 10.0 )
else:
request = method( url, auth = self.auth )
request = method( url, auth = self.auth, timeout = 10.0 )
except requests.exceptions.ConnectionError:
if _countdown > 0:
time.sleep( 2 ** ( 5 - _countdown ) )
@ -82,7 +104,7 @@ class APIv2( object ):
except:
return None
else:
raise ValueError( request.text )
request.raise_for_status()
def get_one( self, url, no_d = False, query = None ):
url = self.normalize_url( url, no_d = no_d, query = query )