equal periodic and retry

Author: pcrespov

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

@@ -33,12 +33,13 @@ def create_background_task_to_prune_api_keys(
 ) -> CleanupContextFunc:
 
     async def _cleanup_ctx_fun(app: web.Application) -> AsyncIterator[None]:
+        interval = timedelta(seconds=wait_period_s)
 
         @exclusive_periodic(
             # Function-exclusiveness is required to avoid multiple tasks like thisone running concurrently
             get_redis_lock_manager_client_sdk(app),
-            task_interval=timedelta(seconds=wait_period_s),
-            retry_after=timedelta(minutes=5),
+            task_interval=interval,
+            retry_after=interval,
         )
         async def _prune_expired_api_keys_periodically() -> None:
             with log_context(_logger, logging.INFO, "Pruning expired API keys"):

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

@@ -24,12 +24,13 @@ def create_background_task_for_garbage_collection() -> CleanupContextFunc:
 
     async def _cleanup_ctx_fun(app: web.Application) -> AsyncIterator[None]:
         settings: GarbageCollectorSettings = get_plugin_settings(app)
+        interval = timedelta(seconds=settings.GARBAGE_COLLECTOR_INTERVAL_S)
 
         @exclusive_periodic(
             # Function-exclusiveness is required to avoid multiple tasks like thisone running concurrently
             get_redis_lock_manager_client_sdk(app),
-            task_interval=timedelta(seconds=settings.GARBAGE_COLLECTOR_INTERVAL_S),
-            retry_after=timedelta(minutes=5),
+            task_interval=interval,
+            retry_after=interval,
         )
         async def _collect_garbage_periodically() -> None:
             with log_context(_logger, logging.INFO, "Garbage collect cycle"):

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

@@ -21,12 +21,13 @@
 def create_background_task_to_prune_trash(wait_s: float) -> CleanupContextFunc:
 
     async def _cleanup_ctx_fun(app: web.Application) -> AsyncIterator[None]:
+        interval = timedelta(seconds=wait_s)
 
         @exclusive_periodic(
             # Function-exclusiveness is required to avoid multiple tasks like thisone running concurrently
             get_redis_lock_manager_client_sdk(app),
-            task_interval=timedelta(seconds=wait_s),
-            retry_after=timedelta(minutes=5),
+            task_interval=interval,
+            retry_after=interval,
         )
         async def _prune_trash_periodically() -> None:
             with log_context(_logger, logging.INFO, "Deleting expired trashed items"):

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

@@ -70,12 +70,13 @@ async def _update_expired_users(app: web.Application):
 def create_background_task_for_trial_accounts(wait_s: float) -> CleanupContextFunc:
 
     async def _cleanup_ctx_fun(app: web.Application) -> AsyncIterator[None]:
+        interval = timedelta(seconds=wait_s)
 
         @exclusive_periodic(
             # Function-exclusiveness is required to avoid multiple tasks like thisone running concurrently
             get_redis_lock_manager_client_sdk(app),
-            task_interval=timedelta(seconds=wait_s),
-            retry_after=timedelta(minutes=5),
+            task_interval=interval,
+            retry_after=interval,
         )
         async def _update_expired_users_periodically() -> None:
             with log_context(_logger, logging.INFO, "Updating expired users"):