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

Merge remote-tracking branch 'origin/master' into swaggerlikeus

Browse source 
Conflicts:
	endpoints/api.py
This commit is contained in:
jakedt 2014-03-25 15:50:03 -04:00
commit 5f98bf8dab
5 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
data/buildlogs.py
View file

@ -40,9 +40,12 @@ class BuildLogs(object):
Returns a tuple of the current length of the list and an iterable of the
requested log entries.
"""
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))
try:
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:
return (0, [])
@staticmethod
def _status_key(build_id):
@ -59,5 +62,9 @@ class BuildLogs(object):
"""
Loads the status information for the specified build id.
"""
fetched = self._redis.get(self._status_key(build_id))
try:
fetched = self._redis.get(self._status_key(build_id))
except redis.ConnectionError:
return None
return json.loads(fetched) if fetched else None