vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1500 from coreos-inc/better-errors

Browse source 
Better errors
This commit is contained in:
josephschorr 2016-05-31 15:54:41 -04:00
commit 1ddc73416c
8 changed files with 57 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

8
data/buildlogs.py
View file

@ -61,8 +61,8 @@ class RedisBuildLogs(object):
llen = self._redis.llen(self._logs_key(build_id))
log_entries = self._redis.lrange(self._logs_key(build_id), start_index, -1)
return (llen, (json.loads(entry) for entry in log_entries))
except redis.ConnectionError:
raise BuildStatusRetrievalError('Cannot retrieve build logs')
except redis.ConnectionError as ce:
raise BuildStatusRetrievalError('Cannot retrieve build logs: %s' % ce)
def expire_log_entries(self, build_id):
"""
@ -87,8 +87,8 @@ class RedisBuildLogs(object):
"""
try:
fetched = self._redis.get(self._status_key(build_id))
except redis.ConnectionError:
raise BuildStatusRetrievalError('Cannot retrieve build status')
except redis.ConnectionError as ce:
raise BuildStatusRetrievalError('Cannot retrieve build status: %s' % ce)
return json.loads(fetched) if fetched else None