♻️ Refactor periodic task setup to use periodic_task_lifespan utility

Author: pcrespov

services/web/server/src/simcore_service_webserver/garbage_collector/_tasks_api_keys.py

@@ -13,7 +13,7 @@
 from simcore_service_webserver.redis import get_redis_lock_manager_client_sdk
 
 from ..api_keys import api_keys_service
-from ._tasks_utils import CleanupContextFunc, setup_periodic_task
+from ._tasks_utils import CleanupContextFunc, periodic_task_lifespan
 
 _logger = logging.getLogger(__name__)
 
@@ -45,7 +45,9 @@ async def _prune_expired_api_keys_periodically() -> None:
             with log_context(_logger, logging.INFO, "Pruning expired API keys"):
                 await _prune_expired_api_keys(app)
 
-        async for _ in setup_periodic_task(app, _prune_expired_api_keys_periodically):
+        async for _ in periodic_task_lifespan(
+            app, _prune_expired_api_keys_periodically
+        ):
             yield
 
     return _cleanup_ctx_fun

services/web/server/src/simcore_service_webserver/garbage_collector/_tasks_core.py

@@ -14,7 +14,7 @@
 from simcore_service_webserver.redis import get_redis_lock_manager_client_sdk
 
 from ._core import collect_garbage
-from ._tasks_utils import CleanupContextFunc, setup_periodic_task
+from ._tasks_utils import CleanupContextFunc, periodic_task_lifespan
 from .settings import GarbageCollectorSettings, get_plugin_settings
 
 _logger = logging.getLogger(__name__)
@@ -38,7 +38,7 @@ async def _collect_garbage_periodically() -> None:
             with log_context(_logger, logging.INFO, "Garbage collect cycle"):
                 await collect_garbage(app)
 
-        async for _ in setup_periodic_task(
+        async for _ in periodic_task_lifespan(
             app, _collect_garbage_periodically, task_name=_GC_TASK_NAME
         ):
             yield

services/web/server/src/simcore_service_webserver/garbage_collector/_tasks_trash.py

@@ -13,7 +13,7 @@
 from simcore_service_webserver.redis import get_redis_lock_manager_client_sdk
 
 from ..trash import trash_service
-from ._tasks_utils import CleanupContextFunc, setup_periodic_task
+from ._tasks_utils import CleanupContextFunc, periodic_task_lifespan
 
 _logger = logging.getLogger(__name__)
 
@@ -33,7 +33,7 @@ async def _prune_trash_periodically() -> None:
             with log_context(_logger, logging.INFO, "Deleting expired trashed items"):
                 await trash_service.safe_delete_expired_trash_as_admin(app)
 
-        async for _ in setup_periodic_task(app, _prune_trash_periodically):
+        async for _ in periodic_task_lifespan(app, _prune_trash_periodically):
             yield
 
     return _cleanup_ctx_fun

services/web/server/src/simcore_service_webserver/garbage_collector/_tasks_users.py

@@ -16,7 +16,7 @@
 from ..login import login_service
 from ..security import security_service
 from ..users.api import update_expired_users
-from ._tasks_utils import CleanupContextFunc, setup_periodic_task
+from ._tasks_utils import CleanupContextFunc, periodic_task_lifespan
 
 _logger = logging.getLogger(__name__)
 
@@ -82,7 +82,7 @@ async def _update_expired_users_periodically() -> None:
             with log_context(_logger, logging.INFO, "Updating expired users"):
                 await _update_expired_users(app)
 
-        async for _ in setup_periodic_task(app, _update_expired_users_periodically):
+        async for _ in periodic_task_lifespan(app, _update_expired_users_periodically):
             yield
 
     return _cleanup_ctx_fun

services/web/server/src/simcore_service_webserver/garbage_collector/_tasks_utils.py

@@ -6,7 +6,7 @@
 from collections.abc import AsyncIterator, Callable, Coroutine
 
 from aiohttp import web
-from servicelib.async_utils import cancel_wait_task
+from common_library.async_tools import cancel_wait_task
 
 CleanupContextFunc = Callable[[web.Application], AsyncIterator[None]]
 
@@ -19,7 +19,7 @@ def create_task_name(coro: Callable) -> str:
     return f"{coro.__module__}.{coro.__name__}"
 
 
-async def setup_periodic_task(
+async def periodic_task_lifespan(
     app: web.Application,
     periodic_task_coro: Callable[[], Coroutine[None, None, None]],
     *,