Skip to content

Commit 7563c97

Browse files
committed
fixed test
1 parent 0b27d92 commit 7563c97

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

services/efs-guardian/src/simcore_service_efs_guardian/services/background_tasks.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import logging
2-
from datetime import UTC, datetime, timedelta
2+
from datetime import UTC, datetime
33

44
from fastapi import FastAPI
55
from models_library.projects import ProjectID
66
from models_library.projects_state import ProjectStatus
7-
from servicelib.background_task_utils import exclusive_periodic
87
from servicelib.logging_utils import log_context
98
from servicelib.project_lock import (
109
PROJECT_LOCK_TIMEOUT,
@@ -23,11 +22,6 @@
2322
_logger = logging.getLogger(__name__)
2423

2524

26-
@exclusive_periodic(
27-
get_redis_lock_client,
28-
task_interval=timedelta(hours=1),
29-
retry_after=timedelta(minutes=5),
30-
)
3125
async def removal_policy_task(app: FastAPI) -> None:
3226
_logger.info("Removal policy task started")
3327

services/efs-guardian/src/simcore_service_efs_guardian/services/background_tasks_setup.py

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,26 @@
11
import asyncio
22
import logging
33
from collections.abc import Awaitable, Callable
4+
from datetime import timedelta
45
from typing import TypedDict
56

67
from fastapi import FastAPI
78
from servicelib.async_utils import cancel_wait_task
9+
from servicelib.background_task_utils import exclusive_periodic
810
from servicelib.logging_utils import log_catch, log_context
911

1012
from .background_tasks import removal_policy_task
13+
from .modules.redis import get_redis_lock_client
14+
15+
16+
@exclusive_periodic(
17+
get_redis_lock_client,
18+
task_interval=timedelta(hours=1),
19+
retry_after=timedelta(minutes=5),
20+
)
21+
async def periodic_removal_policy_task(app: FastAPI) -> None:
22+
await removal_policy_task(app)
23+
1124

1225
_logger = logging.getLogger(__name__)
1326

@@ -19,7 +32,7 @@ class EfsGuardianBackgroundTask(TypedDict):
1932

2033
_EFS_GUARDIAN_BACKGROUND_TASKS = [
2134
EfsGuardianBackgroundTask(
22-
name="efs_removal_policy_task", task_func=removal_policy_task
35+
name="efs_removal_policy_task", task_func=periodic_removal_policy_task
2336
)
2437
]
2538

0 commit comments

Comments
 (0)