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

api: Add 55 second timeout when longpolling.

Browse source 
(imported from commit c5c1f9fcfa9ec5eff84f9bc7e98042f87193e98c)
This commit is contained in:
Tim Abbott 2012-11-09 14:16:22 -05:00
parent c3c3045e3d
commit c0e29b6a54
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
common.py
View file

@ -21,7 +21,7 @@ class HumbugAPI():
self.retry_on_errors = retry_on_errors self.retry_on_errors = retry_on_errors
self.client_name = client self.client_name = client
def do_api_query(self, request, url): def do_api_query(self, request, url, longpolling = False):
had_error_retry = False had_error_retry = False
request["email"] = self.email request["email"] = self.email
request["api-key"] = self.api_key request["api-key"] = self.api_key
@ -29,7 +29,8 @@ class HumbugAPI():
request["failures"] = 0 request["failures"] = 0
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, timeout=55)
# On 50x errors, try again after a short sleep # On 50x errors, try again after a short sleep
if str(res.status_code).startswith('5') and self.retry_on_errors: if str(res.status_code).startswith('5') and self.retry_on_errors:
@ -43,6 +44,14 @@ class HumbugAPI():
sys.stdout.flush() sys.stdout.flush()
time.sleep(1) time.sleep(1)
continue continue
except requests.exceptions.Timeout:
if longpolling:
# When longpolling, we expect the timeout to fire,
# and the correct response is to just retry
continue
else:
return {'msg': "Connection error:\n%s" % traceback.format_exc(),
"result": "connection-error"}
except requests.exceptions.ConnectionError: except requests.exceptions.ConnectionError:
if self.retry_on_errors: if self.retry_on_errors:
if self.verbose: if self.verbose:
@ -73,7 +82,8 @@ class HumbugAPI():
return self.do_api_query(request, "/api/v1/send_message") return self.do_api_query(request, "/api/v1/send_message")
def get_messages(self, request = {}): def get_messages(self, request = {}):
return self.do_api_query(request, "/api/v1/get_messages") return self.do_api_query(request, "/api/v1/get_messages",
longpolling=True)
def get_profile(self, request = {}): def get_profile(self, request = {}):
return self.do_api_query(request, "/api/v1/get_profile") return self.do_api_query(request, "/api/v1/get_profile")