Skip to content

Commit 39c18cc

Browse files
committed
🎨 Refactor resource manager keys to use CLIENT_SOCKET_REGISTRY_APPKEY for consistency
1 parent 5391b78 commit 39c18cc

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

services/web/server/src/simcore_service_webserver/resource_manager/_constants.py

Lines changed: 0 additions & 2 deletions
This file was deleted.

services/web/server/src/simcore_service_webserver/resource_manager/plugin.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414

1515
from ..application_setup import ModuleCategory, app_setup_func
1616
from ..redis import setup_redis
17-
from ._constants import APP_CLIENT_SOCKET_REGISTRY_KEY, APP_RESOURCE_MANAGER_TASKS_KEY
18-
from .registry import RedisResourceRegistry
17+
from .registry import CLIENT_SOCKET_REGISTRY_APPKEY, RedisResourceRegistry
1918

2019
_logger = logging.getLogger(__name__)
2120

@@ -33,9 +32,7 @@
3332
def setup_resource_manager(app: web.Application) -> bool:
3433
"""Sets up resource manager subsystem in the application"""
3534

36-
app[APP_RESOURCE_MANAGER_TASKS_KEY] = []
37-
3835
setup_redis(app)
39-
app[APP_CLIENT_SOCKET_REGISTRY_KEY] = RedisResourceRegistry(app)
36+
app[CLIENT_SOCKET_REGISTRY_APPKEY] = RedisResourceRegistry(app)
4037

4138
return True

services/web/server/src/simcore_service_webserver/resource_manager/registry.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
"""
1515

1616
import logging
17+
from typing import Final
1718

1819
import redis.asyncio as aioredis
1920
from aiohttp import web
2021
from servicelib.redis import handle_redis_returns_union_types
2122

2223
from ..redis import get_redis_resources_client
23-
from ._constants import APP_CLIENT_SOCKET_REGISTRY_KEY
2424
from .models import (
2525
ALIVE_SUFFIX,
2626
RESOURCE_SUFFIX,
@@ -144,7 +144,12 @@ async def get_all_resource_keys(self) -> tuple[AliveSessions, DeadSessions]:
144144
return (alive_keys, dead_keys)
145145

146146

147+
CLIENT_SOCKET_REGISTRY_APPKEY: Final = web.AppKey(
148+
"CLIENT_SOCKET_REGISTRY", RedisResourceRegistry
149+
)
150+
151+
147152
def get_registry(app: web.Application) -> RedisResourceRegistry:
148-
client: RedisResourceRegistry = app[APP_CLIENT_SOCKET_REGISTRY_KEY]
153+
client = app[CLIENT_SOCKET_REGISTRY_APPKEY]
149154
assert isinstance(client, RedisResourceRegistry) # nosec
150155
return client

0 commit comments

Comments
 (0)