ttygroup
/
gertty
Code Issues Proposed changes

Treat HTTP 503 responses as offline 

This status code means the service is unavailable, so we should
probably switch to offline in that case.

Change-Id: I8fc6d2851423ebdc78a9a9a96b9a31c34ae981ec
This commit is contained in:
James E. Blair 2016-06-03 13:48:05 -07:00
parent e41ef69663
commit 27f90d0b73
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gertty/sync.py
View File

@ -47,6 +47,8 @@ TIMEOUT=30
CLOSED_STATUSES = ['MERGED', 'ABANDONED']
class OfflineError(Exception):
pass
class MultiQueue(object):
def __init__(self, priorities):
@ -1359,7 +1361,7 @@ class Sync(object):
task.run(self)
task.complete(True)
self.queue.complete(task)
except requests.ConnectionError as e:
except (requests.ConnectionError, OfflineError) as e:
self.log.warning("Offline due to: %s" % (e,))
if not self.offline:
self.submitTask(GetVersionTask(HIGH_PRIORITY))
@ -1384,6 +1386,11 @@ class Sync(object):
def url(self, path):
return self.app.config.url + 'a/' + path
def checkResponse(self, response):
self.log.debug('HTTP status code: %d', response.status_code)
if response.status_code == 503:
raise OfflineError("Received 503 status code")
def get(self, path):
url = self.url(path)
self.log.debug('GET: %s' % (url,))
@ -1393,6 +1400,7 @@ class Sync(object):
headers = {'Accept': 'application/json',
'Accept-Encoding': 'gzip',
'User-Agent': self.user_agent})
self.checkResponse(r)
if r.status_code == 200:
ret = json.loads(r.text[4:])
if len(ret):
@ -1400,8 +1408,6 @@ class Sync(object):
else:
self.log.debug('200 OK, No body.')
return ret
else:
self.log.warn('HTTP response: %d', r.status_code)
def post(self, path, data):
url = self.url(path)
@ -1412,6 +1418,7 @@ class Sync(object):
auth=self.auth, timeout=TIMEOUT,
headers = {'Content-Type': 'application/json;charset=UTF-8',
'User-Agent': self.user_agent})
self.checkResponse(r)
self.log.debug('Received: %s' % (r.text,))
ret = None
if r.text and len(r.text)>4:
@ -1431,6 +1438,7 @@ class Sync(object):
auth=self.auth, timeout=TIMEOUT,
headers = {'Content-Type': 'application/json;charset=UTF-8',
'User-Agent': self.user_agent})
self.checkResponse(r)
self.log.debug('Received: %s' % (r.text,))
def delete(self, path, data):
@ -1442,6 +1450,7 @@ class Sync(object):
auth=self.auth, timeout=TIMEOUT,
headers = {'Content-Type': 'application/json;charset=UTF-8',
'User-Agent': self.user_agent})
self.checkResponse(r)
self.log.debug('Received: %s' % (r.text,))
def syncSubscribedProjects(self):