mirror of
https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git
synced 2024-11-29 07:21:27 +00:00
refactor(backups): quick-expiration logs of jobs status updates
This commit is contained in:
parent
b2e231ebae
commit
7ddfad10d4
|
@ -27,7 +27,7 @@ from selfprivacy_api.utils.redis_pool import RedisPool
|
||||||
JOB_EXPIRATION_SECONDS = 10 * 24 * 60 * 60 # ten days
|
JOB_EXPIRATION_SECONDS = 10 * 24 * 60 * 60 # ten days
|
||||||
|
|
||||||
|
|
||||||
class JobStatus(Enum):
|
class JobStatus(str, Enum):
|
||||||
"""
|
"""
|
||||||
Status of a job.
|
Status of a job.
|
||||||
"""
|
"""
|
||||||
|
@ -70,6 +70,7 @@ class Jobs:
|
||||||
jobs = Jobs.get_jobs()
|
jobs = Jobs.get_jobs()
|
||||||
for job in jobs:
|
for job in jobs:
|
||||||
Jobs.remove(job)
|
Jobs.remove(job)
|
||||||
|
Jobs.reset_logs()
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def add(
|
def add(
|
||||||
|
@ -120,6 +121,21 @@ class Jobs:
|
||||||
return True
|
return True
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def reset_logs():
|
||||||
|
redis = RedisPool().get_connection()
|
||||||
|
for key in redis.keys("jobs_logs:" + "*"):
|
||||||
|
redis.delete(key)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def log_status_update(job: Job, status: JobStatus):
|
||||||
|
redis = RedisPool().get_connection()
|
||||||
|
key = _redis_log_key_from_uuid(job.uid)
|
||||||
|
if redis.exists(key):
|
||||||
|
assert redis.type(key) == "list"
|
||||||
|
redis.lpush(key, str(status))
|
||||||
|
redis.expire(key, 10)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def update(
|
def update(
|
||||||
job: Job,
|
job: Job,
|
||||||
|
@ -143,6 +159,7 @@ class Jobs:
|
||||||
if progress is not None:
|
if progress is not None:
|
||||||
job.progress = progress
|
job.progress = progress
|
||||||
job.status = status
|
job.status = status
|
||||||
|
Jobs.log_status_update(job, status)
|
||||||
job.updated_at = datetime.datetime.now()
|
job.updated_at = datetime.datetime.now()
|
||||||
job.error = error
|
job.error = error
|
||||||
job.result = result
|
job.result = result
|
||||||
|
@ -198,6 +215,10 @@ def _redis_key_from_uuid(uuid_string):
|
||||||
return "jobs:" + str(uuid_string)
|
return "jobs:" + str(uuid_string)
|
||||||
|
|
||||||
|
|
||||||
|
def _redis_log_key_from_uuid(uuid_string):
|
||||||
|
return "jobs_logs:" + str(uuid_string)
|
||||||
|
|
||||||
|
|
||||||
def _store_job_as_hash(redis, redis_key, model):
|
def _store_job_as_hash(redis, redis_key, model):
|
||||||
for key, value in model.dict().items():
|
for key, value in model.dict().items():
|
||||||
if isinstance(value, uuid.UUID):
|
if isinstance(value, uuid.UUID):
|
||||||
|
|
Loading…
Reference in a new issue