Skip to content

Commit d5c0613

Browse files
committed
ensure there is no space in the client name
1 parent 669007c commit d5c0613

File tree

9 files changed

+21
-9
lines changed
  • services
    • autoscaling/src/simcore_service_autoscaling/modules
    • clusters-keeper/src/simcore_service_clusters_keeper/modules
    • director-v2/src/simcore_service_director_v2/modules
    • dynamic-scheduler/src/simcore_service_dynamic_scheduler/services
    • efs-guardian/src/simcore_service_efs_guardian/services/modules
    • resource-usage-tracker/src/simcore_service_resource_usage_tracker

9 files changed

+21
-9
lines changed

services/autoscaling/src/simcore_service_autoscaling/modules/redis.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
from servicelib.redis import RedisClientSDK
66
from settings_library.redis import RedisDatabase, RedisSettings
77

8+
from .._meta import APP_NAME
9+
810
logger = logging.getLogger(__name__)
911

1012

@@ -14,7 +16,7 @@ async def on_startup() -> None:
1416
settings: RedisSettings = app.state.settings.AUTOSCALING_REDIS
1517
redis_locks_dsn = settings.build_redis_dsn(RedisDatabase.LOCKS)
1618
app.state.redis_client_sdk = client = RedisClientSDK(
17-
redis_locks_dsn, client_name=app.title
19+
redis_locks_dsn, client_name=APP_NAME
1820
)
1921
await client.setup()
2022

services/clusters-keeper/src/simcore_service_clusters_keeper/modules/clusters_management_task.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
from servicelib.background_task import start_periodic_task, stop_periodic_task
77
from servicelib.redis_utils import exclusive
88

9+
from .._meta import APP_NAME
910
from ..core.settings import ApplicationSettings
1011
from ..modules.redis import get_redis_client
1112
from .clusters_management_core import check_clusters
@@ -19,7 +20,7 @@ def on_app_startup(app: FastAPI) -> Callable[[], Awaitable[None]]:
1920
async def _startup() -> None:
2021
app_settings: ApplicationSettings = app.state.settings
2122

22-
lock_key = f"{app.title}:clusters-management_lock"
23+
lock_key = f"{APP_NAME}:clusters-management_lock"
2324
lock_value = json.dumps({})
2425
app.state.clusters_cleaning_task = start_periodic_task(
2526
exclusive(get_redis_client(app), lock_key=lock_key, lock_value=lock_value)(

services/clusters-keeper/src/simcore_service_clusters_keeper/modules/redis.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from servicelib.redis import RedisClientSDK
66
from settings_library.redis import RedisDatabase, RedisSettings
77

8+
from .._meta import APP_NAME
89
from ..core.settings import get_application_settings
910

1011
logger = logging.getLogger(__name__)
@@ -16,7 +17,7 @@ async def on_startup() -> None:
1617
settings: RedisSettings = get_application_settings(app).CLUSTERS_KEEPER_REDIS
1718
redis_locks_dsn = settings.build_redis_dsn(RedisDatabase.LOCKS)
1819
app.state.redis_client_sdk = client = RedisClientSDK(
19-
redis_locks_dsn, client_name=app.title
20+
redis_locks_dsn, client_name=APP_NAME
2021
)
2122
await client.setup()
2223

services/director-v2/src/simcore_service_director_v2/modules/comp_scheduler/_task.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
from servicelib.redis_utils import exclusive
1111
from settings_library.redis import RedisDatabase
1212

13+
from ..._meta import APP_NAME
1314
from . import _scheduler_factory
1415

1516
_logger = logging.getLogger(__name__)
@@ -26,7 +27,7 @@ async def start_scheduler() -> None:
2627
_logger, level=logging.INFO, msg="starting computational scheduler"
2728
):
2829
redis_clients_manager: RedisClientsManager = app.state.redis_clients_manager
29-
lock_key = f"{app.title}:computational_scheduler"
30+
lock_key = f"{APP_NAME}:computational_scheduler"
3031
app.state.scheduler = scheduler = await _scheduler_factory.create_from_db(
3132
app
3233
)

services/director-v2/src/simcore_service_director_v2/modules/redis.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from servicelib.redis import RedisClientsManager, RedisManagerDBConfig
33
from settings_library.redis import RedisDatabase
44

5+
from .._meta import APP_NAME
56
from ..core.settings import AppSettings
67

78

@@ -18,7 +19,7 @@ async def on_startup() -> None:
1819
)
1920
},
2021
settings=settings.REDIS,
21-
client_name=app.title,
22+
client_name=APP_NAME,
2223
)
2324
await redis_clients_manager.setup()
2425

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/services/redis.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
from servicelib.redis import RedisClientSDK, RedisClientsManager, RedisManagerDBConfig
55
from settings_library.redis import RedisDatabase, RedisSettings
66

7+
from .._meta import APP_NAME
8+
79
_DECODE_DBS: Final[set[RedisDatabase]] = {
810
RedisDatabase.LOCKS,
911
}
@@ -24,7 +26,7 @@ async def on_startup() -> None:
2426
{RedisManagerDBConfig(x, decode_responses=False) for x in _BINARY_DBS}
2527
| {RedisManagerDBConfig(x, decode_responses=True) for x in _DECODE_DBS},
2628
settings,
27-
client_name=app.title,
29+
client_name=APP_NAME,
2830
)
2931
await manager.setup()
3032

services/efs-guardian/src/simcore_service_efs_guardian/services/modules/redis.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
from servicelib.redis import RedisClientSDK
66
from settings_library.redis import RedisDatabase, RedisSettings
77

8+
from ..._meta import APP_NAME
9+
810
logger = logging.getLogger(__name__)
911

1012

@@ -14,7 +16,7 @@ async def on_startup() -> None:
1416
settings: RedisSettings = app.state.settings.EFS_GUARDIAN_REDIS
1517
redis_locks_dsn = settings.build_redis_dsn(RedisDatabase.LOCKS)
1618
app.state.redis_lock_client_sdk = lock_client = RedisClientSDK(
17-
redis_locks_dsn, client_name=app.title
19+
redis_locks_dsn, client_name=APP_NAME
1820
)
1921
await lock_client.setup()
2022

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/_meta.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
API_VERSION: Final[VersionStr] = info.__version__
2020
API_VTAG: Final[VersionTag] = parse_obj_as(VersionTag, info.api_prefix_path_tag)
2121
SUMMARY: Final[str] = info.get_summary()
22-
22+
APP_NAME: Final[str] = PROJECT_NAME
2323

2424
# NOTE: https://texteditor.com/ascii-frames/
2525
APP_STARTED_BANNER_MSG = r"""

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/modules/redis.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
from servicelib.redis import RedisClientSDK
66
from settings_library.redis import RedisDatabase, RedisSettings
77

8+
from ..._meta import APP_NAME
9+
810
logger = logging.getLogger(__name__)
911

1012

@@ -14,7 +16,7 @@ async def on_startup() -> None:
1416
settings: RedisSettings = app.state.settings.RESOURCE_USAGE_TRACKER_REDIS
1517
redis_locks_dsn = settings.build_redis_dsn(RedisDatabase.LOCKS)
1618
app.state.redis_client_sdk = client = RedisClientSDK(
17-
redis_locks_dsn, client_name=app.title
19+
redis_locks_dsn, client_name=APP_NAME
1820
)
1921
await client.setup()
2022

0 commit comments

Comments
 (0)