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

Set redis logs entries to expire rather than to immediately delete them to make the logs archiver idempotent.

Browse source
This commit is contained in:
Jake Moshenko 2014-09-12 13:13:14 -04:00
parent 353da13b16
commit c01de4a916
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
data/buildlogs.py
View file

@ -2,6 +2,11 @@ import redis
import json
from util.dynamic import import_class
from datetime import timedelta
ONE_DAY = timedelta(days=1)
class BuildStatusRetrievalError(Exception):
pass
@ -54,11 +59,11 @@ class RedisBuildLogs(object):
except redis.ConnectionError:
raise BuildStatusRetrievalError('Cannot retrieve build logs')
def delete_log_entries(self, build_id):
def expire_log_entries(self, build_id):
"""
Deletes the logs and status keys completely.
Sets the log entry to expire in 1 day.
"""
self._redis.delete(self._logs_key(build_id))
self._redis.expire(self._logs_key(build_id), ONE_DAY)
@staticmethod

4
test/testlogs.py
View file

@ -199,10 +199,10 @@ class TestBuildLogs(RedisBuildLogs):
else:
return super(TestBuildLogs, self).get_status(build_id)
def delete_log_entries(self, build_id):
def expire_log_entries(self, build_id):
if build_id == self.test_build_id:
return
if not self.allow_delegate:
return None
else:
return super(TestBuildLogs, self).delete_log_entries(build_id)
return super(TestBuildLogs, self).expire_log_entries(build_id)

2
workers/buildlogsarchiver.py
View file

@ -44,7 +44,7 @@ def archive_redis_buildlogs():
to_archive.logs_archived = True
to_archive.save()
build_logs.delete_log_entries(to_archive.uuid)
build_logs.expire_log_entries(to_archive.uuid)
except RepositoryBuild.DoesNotExist:
logger.debug('No more builds to archive')