|
4 | 4 | from fastapi import FastAPI |
5 | 5 | from models_library.projects import ProjectID |
6 | 6 | from models_library.projects_state import ProjectStatus |
| 7 | +from servicelib.logging_utils import log_context |
7 | 8 | from servicelib.project_lock import ( |
8 | 9 | PROJECT_LOCK_TIMEOUT, |
9 | 10 | PROJECT_REDIS_LOCK_KEY, |
@@ -50,17 +51,18 @@ async def removal_policy_task(app: FastAPI) -> None: |
50 | 51 | < base_start_timestamp |
51 | 52 | - app_settings.EFS_REMOVAL_POLICY_TASK_AGE_LIMIT_TIMEDELTA |
52 | 53 | ): |
53 | | - _logger.info( |
54 | | - "Removing data for project %s started, project last change date %s, efs removal policy task age limit timedelta %s", |
55 | | - project_id, |
56 | | - _project_last_change_date, |
57 | | - app_settings.EFS_REMOVAL_POLICY_TASK_AGE_LIMIT_TIMEDELTA, |
58 | | - ) |
59 | | - redis_lock = get_redis_lock_client(app).redis.lock( |
60 | | - PROJECT_REDIS_LOCK_KEY.format(project_id), |
61 | | - timeout=PROJECT_LOCK_TIMEOUT.total_seconds(), |
62 | | - ) |
63 | | - async with lock_project( |
64 | | - redis_lock, project_uuid=project_id, status=ProjectStatus.MAINTAINING |
| 54 | + with log_context( |
| 55 | + _logger, |
| 56 | + logging.INFO, |
| 57 | + msg=f"Removing data for project {project_id} started, project last change date {_project_last_change_date}, efs removal policy task age limit timedelta {app_settings.EFS_REMOVAL_POLICY_TASK_AGE_LIMIT_TIMEDELTA}", |
65 | 58 | ): |
66 | | - await efs_manager.remove_project_efs_data(project_id) |
| 59 | + redis_lock = get_redis_lock_client(app).redis.lock( |
| 60 | + PROJECT_REDIS_LOCK_KEY.format(project_id), |
| 61 | + timeout=PROJECT_LOCK_TIMEOUT.total_seconds(), |
| 62 | + ) |
| 63 | + async with lock_project( |
| 64 | + redis_lock, |
| 65 | + project_uuid=project_id, |
| 66 | + status=ProjectStatus.MAINTAINING, |
| 67 | + ): |
| 68 | + await efs_manager.remove_project_efs_data(project_id) |
0 commit comments