Skip to content

Commit f4cc3ae

Browse files
committed
sets up WEBSERVER_RPC_NAMESPACE
1 parent 0a42d6d commit f4cc3ae

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

services/docker-compose.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ services:
6969

7070
WEBSERVER_HOST: ${WB_API_WEBSERVER_HOST}
7171
WEBSERVER_PORT: ${WB_API_WEBSERVER_PORT}
72+
WEBSERVER_RPC_NAMESPACE: ${WB_API_WEBSERVER_HOST}
7273
WEBSERVER_SESSION_SECRET_KEY: ${WEBSERVER_SESSION_SECRET_KEY}
7374
API_SERVER_TRACING: ${API_SERVER_TRACING}
7475

@@ -716,6 +717,7 @@ services:
716717

717718
WEBSERVER_HOST: ${WEBSERVER_HOST}
718719
WEBSERVER_PORT: ${WEBSERVER_PORT}
720+
WEBSERVER_RPC_NAMESPACE: ${WEBSERVER_HOST}
719721

720722
# WEBSERVER_SERVER_PORT
721723

@@ -930,6 +932,7 @@ services:
930932
<<: *webserver_environment
931933
WEBSERVER_HOST: ${WB_API_WEBSERVER_HOST}
932934
WEBSERVER_PORT: ${WB_API_WEBSERVER_PORT}
935+
WEBSERVER_RPC_NAMESPACE: ${WB_API_WEBSERVER_HOST}
933936
WEBSERVER_STATICWEB: "null"
934937
WEBSERVER_FUNCTIONS: ${WEBSERVER_FUNCTIONS} # needed for api-server
935938

@@ -952,6 +955,7 @@ services:
952955

953956
WEBSERVER_HOST: ${WEBSERVER_HOST}
954957
WEBSERVER_PORT: ${WEBSERVER_PORT}
958+
WEBSERVER_RPC_NAMESPACE: "null"
955959

956960
DIRECTOR_V2_HOST: ${DIRECTOR_V2_HOST}
957961
DIRECTOR_V2_PORT: ${DIRECTOR_V2_PORT}
@@ -1043,9 +1047,6 @@ services:
10431047
# NOTE: keep in sync with the prefix form the hostname
10441048
LONG_RUNNING_TASKS_NAMESPACE_SUFFIX: gc
10451049

1046-
1047-
1048-
10491050
# WEBSERVER_RABBITMQ
10501051
RABBIT_HOST: ${RABBIT_HOST}
10511052
RABBIT_PASSWORD: ${RABBIT_PASSWORD}
@@ -1088,6 +1089,7 @@ services:
10881089
WEBSERVER_DIAGNOSTICS: ${WB_GC_DIAGNOSTICS}
10891090
WEBSERVER_EMAIL: ${WB_GC_EMAIL}
10901091
WEBSERVER_EXPORTER: ${WB_GC_EXPORTER}
1092+
WEBSERVER_FOGBUGZ: "null"
10911093
WEBSERVER_FOLDERS: ${WB_GC_FOLDERS}
10921094
WEBSERVER_FRONTEND: ${WB_GC_FRONTEND}
10931095
WEBSERVER_FUNCTIONS: 0
@@ -1096,7 +1098,6 @@ services:
10961098
WEBSERVER_HOST: ${WEBSERVER_HOST}
10971099
WEBSERVER_INVITATIONS: ${WB_GC_INVITATIONS}
10981100
WEBSERVER_LICENSES: "null"
1099-
WEBSERVER_FOGBUGZ: "null"
11001101
WEBSERVER_LOGIN: ${WB_GC_LOGIN}
11011102
WEBSERVER_LOGLEVEL: ${WB_GC_LOGLEVEL}
11021103
WEBSERVER_NOTIFICATIONS: ${WB_GC_NOTIFICATIONS}
@@ -1105,6 +1106,7 @@ services:
11051106
WEBSERVER_PRODUCTS: ${WB_GC_PRODUCTS}
11061107
WEBSERVER_PROJECTS: ${WB_GC_PROJECTS}
11071108
WEBSERVER_PUBLICATIONS: ${WB_GC_PUBLICATIONS}
1109+
WEBSERVER_RPC_NAMESPACE: "null"
11081110
WEBSERVER_SCICRUNCH: ${WB_GC_SCICRUNCH}
11091111
WEBSERVER_SOCKETIO: ${WB_GC_SOCKETIO}
11101112
WEBSERVER_STATICWEB: ${WB_GC_STATICWEB}
@@ -1163,25 +1165,26 @@ services:
11631165
WEBSERVER_DIRECTOR_V2: "null"
11641166
WEBSERVER_EMAIL: "null"
11651167
WEBSERVER_EXPORTER: "null"
1168+
WEBSERVER_FOGBUGZ: "null"
11661169
WEBSERVER_FOLDERS: 0
11671170
WEBSERVER_FRONTEND: "null"
11681171
WEBSERVER_FUNCTIONS: 0
11691172
WEBSERVER_GARBAGE_COLLECTOR: "null"
11701173
WEBSERVER_GROUPS: 0
11711174
WEBSERVER_INVITATIONS: "null"
11721175
WEBSERVER_LICENSES: "null"
1173-
WEBSERVER_FOGBUGZ: "null"
11741176
WEBSERVER_LOGIN: "null"
11751177
WEBSERVER_NOTIFICATIONS: 0
11761178
WEBSERVER_PAYMENTS: "null"
1177-
WEBSERVER_PROFILING: ${WB_AUTH_PROFILING}
11781179
WEBSERVER_PRODUCTS: 1
1180+
WEBSERVER_PROFILING: ${WB_AUTH_PROFILING}
11791181
WEBSERVER_PROJECTS: "null"
11801182
WEBSERVER_PUBLICATIONS: 0
11811183
WEBSERVER_RABBITMQ: "null"
11821184
WEBSERVER_REALTIME_COLLABORATION: "null"
11831185
WEBSERVER_REDIS: "null"
11841186
WEBSERVER_RESOURCE_USAGE_TRACKER: "null"
1187+
WEBSERVER_RPC_NAMESPACE: "null"
11851188
WEBSERVER_SCICRUNCH: "null"
11861189
WEBSERVER_SOCKETIO: 0
11871190
WEBSERVER_STATICWEB: "null"

services/web/server/src/simcore_service_webserver/application_settings.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from common_library.logging.logging_utils_filtering import LoggerName, MessageSubstring
88
from common_library.pydantic_fields_extension import is_nullable
99
from models_library.basic_types import LogLevel, PortInt, VersionTag
10+
from models_library.rabbitmq_basic_types import RPCNamespace
1011
from models_library.utils.change_case import snake_to_camel
1112
from pydantic import (
1213
AliasChoices,
@@ -154,6 +155,11 @@ class ApplicationSettings(BaseApplicationSettings, MixinLoggingSettings):
154155
),
155156
] = DEFAULT_FACTORY
156157

158+
WEBSERVER_RPC_NAMESPACE: Annotated[
159+
RPCNamespace | None,
160+
Field(description="Namespace for the RPC service, if any, otherwise None"),
161+
]
162+
157163
WEBSERVER_SERVER_HOST: Annotated[
158164
# TODO: find a better name!?
159165
str,

0 commit comments

Comments
 (0)