xenofem/python-zulip-api
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

API: Update error handling.

Browse source 
(imported from commit 2084975c5476a4792a633bf70469be26082da8c3)
This commit is contained in:
Tim Abbott 2012-10-22 14:31:21 -04:00
parent 8e1247835c
commit a386a2939c
1 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
common.py
View file

@ -4,18 +4,22 @@ import requests
import time import time
import traceback import traceback
import urlparse import urlparse
import sys
# Check that we have a recent enough version # Check that we have a recent enough version
assert(requests.__version__ > '0.12') assert(requests.__version__ > '0.12')
class HumbugAPI(): class HumbugAPI():
def __init__(self, email, api_key, verbose=False, site="https://app.humbughq.com"): def __init__(self, email, api_key, verbose=False, retry_on_errors=True,
site="https://app.humbughq.com"):
self.api_key = api_key self.api_key = api_key
self.email = email self.email = email
self.verbose = verbose self.verbose = verbose
self.base_url = site self.base_url = site
self.retry_on_errors = retry_on_errors
def do_api_query(self, request, url): def do_api_query(self, request, url):
had_error_retry = False
request["email"] = self.email request["email"] = self.email
request["api-key"] = self.api_key request["api-key"] = self.api_key
if "client" not in request: if "client" not in request:
@ -23,18 +27,38 @@ class HumbugAPI():
while True: while True:
try: try:
res = requests.post(urlparse.urljoin(self.base_url, url), data=request, verify=True) res = requests.post(urlparse.urljoin(self.base_url, url), data=request, verify=True)
if res.status_code == requests.codes.service_unavailable:
# On 503 errors, try again after a short sleep # On 50x errors, try again after a short sleep
time.sleep(0.5) if str(res.status_code).startswith('5') and self.retry_on_errors:
if self.verbose:
if not had_error_retry:
sys.stdout.write("connection error -- retrying.")
had_error_retry = True
else:
sys.stdout.write(".")
sys.stdout.flush()
time.sleep(1)
continue continue
except requests.exceptions.ConnectionError: except requests.exceptions.ConnectionError:
if self.retry_on_errors:
if self.verbose:
if not had_error_retry:
sys.stdout.write("connection error -- retrying.")
had_error_retry = True
else:
sys.stdout.write(".")
sys.stdout.flush()
time.sleep(1)
continue
return {'msg': "Connection error:\n%s" % traceback.format_exc(), return {'msg': "Connection error:\n%s" % traceback.format_exc(),
"result": "connection-error"} "result": "connection-error"}
except Exception: except Exception:
# we'll split this out into more cases as we encounter new bugs. # We'll split this out into more cases as we encounter new bugs.
return {'msg': "Unexpected error:\n%s" % traceback.format_exc(), return {'msg': "Unexpected error:\n%s" % traceback.format_exc(),
"result": "unexpected-error"} "result": "unexpected-error"}
if self.verbose and had_error_retry:
print "Success!"
if res.json is not None: if res.json is not None:
return res.json return res.json
return {'msg': res.text, "result": "http-error", return {'msg': res.text, "result": "http-error",
@ -67,9 +91,9 @@ class HumbugAPI():
if 'error' in res.get('result'): if 'error' in res.get('result'):
if self.verbose: if self.verbose:
if res["result"] == "http-error": if res["result"] == "http-error":
print "Unexpected error -- probably a server restart" print "HTTP error fetching messages -- probably a server restart"
elif res["result"] == "connection-error": elif res["result"] == "connection-error":
print "Connection error -- probably server is temporarily down?" print "Connection error fetching messages -- probably server is temporarily down?"
else: else:
print "Server returned error:\n%s" % res["msg"] print "Server returned error:\n%s" % res["msg"]
# TODO: Make this back off once it's more reliable # TODO: Make this back off once it's more reliable