Skip to content

Commit 3b224c8

Browse files
sandereggsanderegg
committed
only require stickyness on specific endpoints
1 parent 5d7d7ce commit 3b224c8

File tree

1 file changed

+53
-46
lines changed

1 file changed

+53
-46
lines changed

‎services/docker-compose.yml‎

Lines changed: 53 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ services:
1414
environment:
1515
API_SERVER_DEV_FEATURES_ENABLED: ${API_SERVER_DEV_FEATURES_ENABLED}
1616
API_SERVER_LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
17-
API_SERVER_LOG_FILTER_MAPPING : ${LOG_FILTER_MAPPING}
17+
API_SERVER_LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
1818
API_SERVER_LOGLEVEL: ${API_SERVER_LOGLEVEL}
1919
API_SERVER_PROFILING: ${API_SERVER_PROFILING}
2020

@@ -112,7 +112,7 @@ services:
112112
SSM_REGION_NAME: ${SSM_REGION_NAME}
113113

114114
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
115-
LOG_FILTER_MAPPING : ${LOG_FILTER_MAPPING}
115+
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
116116
RABBIT_HOST: ${RABBIT_HOST}
117117
RABBIT_PASSWORD: ${RABBIT_PASSWORD}
118118
RABBIT_PORT: ${RABBIT_PORT}
@@ -161,7 +161,7 @@ services:
161161
DIRECTOR_HOST: ${DIRECTOR_HOST:-director}
162162
DIRECTOR_PORT: ${DIRECTOR_PORT:-8080}
163163
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
164-
LOG_FILTER_MAPPING : ${LOG_FILTER_MAPPING}
164+
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
165165
POSTGRES_DB: ${POSTGRES_DB}
166166
POSTGRES_HOST: ${POSTGRES_HOST}
167167
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
@@ -204,7 +204,7 @@ services:
204204
CLUSTERS_KEEPER_SSM_SECRET_ACCESS_KEY: ${CLUSTERS_KEEPER_SSM_SECRET_ACCESS_KEY}
205205
CLUSTERS_KEEPER_EC2_INSTANCES_PREFIX: ${CLUSTERS_KEEPER_EC2_INSTANCES_PREFIX}
206206
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
207-
LOG_FILTER_MAPPING : ${LOG_FILTER_MAPPING}
207+
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
208208
CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES: ${CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES}
209209
PRIMARY_EC2_INSTANCES_ALLOWED_TYPES: ${PRIMARY_EC2_INSTANCES_ALLOWED_TYPES}
210210
PRIMARY_EC2_INSTANCES_KEY_NAME: ${PRIMARY_EC2_INSTANCES_KEY_NAME}
@@ -330,7 +330,7 @@ services:
330330
DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT: ${DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT}
331331

332332
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
333-
LOG_FILTER_MAPPING : ${LOG_FILTER_MAPPING}
333+
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
334334
DIRECTOR_V2_LOGLEVEL: ${DIRECTOR_V2_LOGLEVEL}
335335
MONITORING_ENABLED: ${MONITORING_ENABLED}
336336

@@ -411,7 +411,7 @@ services:
411411
- default
412412
environment:
413413
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
414-
LOG_FILTER_MAPPING : ${LOG_FILTER_MAPPING}
414+
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
415415
RABBIT_HOST: ${RABBIT_HOST}
416416
RABBIT_PASSWORD: ${RABBIT_PASSWORD}
417417
RABBIT_PORT: ${RABBIT_PORT}
@@ -455,7 +455,7 @@ services:
455455
INVITATIONS_SWAGGER_API_DOC_ENABLED: ${INVITATIONS_SWAGGER_API_DOC_ENABLED}
456456
INVITATIONS_USERNAME: ${INVITATIONS_USERNAME}
457457
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
458-
LOG_FILTER_MAPPING : ${LOG_FILTER_MAPPING}
458+
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
459459
INVITATIONS_TRACING: ${INVITATIONS_TRACING}
460460
TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
461461
TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
@@ -467,7 +467,7 @@ services:
467467
- default
468468
environment:
469469
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
470-
LOG_FILTER_MAPPING : ${LOG_FILTER_MAPPING}
470+
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
471471
PAYMENTS_ACCESS_TOKEN_EXPIRE_MINUTES: ${PAYMENTS_ACCESS_TOKEN_EXPIRE_MINUTES}
472472
PAYMENTS_ACCESS_TOKEN_SECRET_KEY: ${PAYMENTS_ACCESS_TOKEN_SECRET_KEY}
473473
PAYMENTS_AUTORECHARGE_DEFAULT_MONTHLY_LIMIT: ${PAYMENTS_AUTORECHARGE_DEFAULT_MONTHLY_LIMIT}
@@ -513,7 +513,7 @@ services:
513513
- default
514514
environment:
515515
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
516-
LOG_FILTER_MAPPING : ${LOG_FILTER_MAPPING}
516+
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
517517
POSTGRES_DB: ${POSTGRES_DB}
518518
POSTGRES_ENDPOINT: ${POSTGRES_ENDPOINT}
519519
POSTGRES_HOST: ${POSTGRES_HOST}
@@ -570,7 +570,7 @@ services:
570570
DYNAMIC_SCHEDULER_USE_INTERNAL_SCHEDULER: ${DYNAMIC_SCHEDULER_USE_INTERNAL_SCHEDULER}
571571
DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT: ${DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT}
572572

573-
LOG_FILTER_MAPPING : ${LOG_FILTER_MAPPING}
573+
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
574574
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
575575

576576
POSTGRES_DB: ${POSTGRES_DB}
@@ -598,7 +598,7 @@ services:
598598
init: true
599599
environment:
600600
DOCKER_API_PROXY_PASSWORD: ${DOCKER_API_PROXY_PASSWORD}
601-
DOCKER_API_PROXY_USER : ${DOCKER_API_PROXY_USER}
601+
DOCKER_API_PROXY_USER: ${DOCKER_API_PROXY_USER}
602602
deploy:
603603
placement:
604604
constraints:
@@ -607,7 +607,7 @@ services:
607607
volumes:
608608
- /var/run/docker.sock:/var/run/docker.sock
609609
networks:
610-
- docker-api-network
610+
- docker-api-network
611611

612612
static-webserver:
613613
image: ${DOCKER_REGISTRY:-itisfoundation}/static-webserver:${DOCKER_IMAGE_TAG:-latest}
@@ -676,7 +676,7 @@ services:
676676
WEBSERVER_PROFILING: ${WEBSERVER_PROFILING}
677677

678678
WEBSERVER_LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
679-
WEBSERVER_LOG_FILTER_MAPPING : ${LOG_FILTER_MAPPING}
679+
WEBSERVER_LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
680680

681681
# WEBSERVER_SERVER_HOST
682682

@@ -741,14 +741,13 @@ services:
741741
INVITATIONS_USERNAME: ${INVITATIONS_USERNAME}
742742

743743
WEBSERVER_LICENSES: ${WEBSERVER_LICENSES}
744-
LICENSES_ITIS_VIP_SYNCER_ENABLED : ${LICENSES_ITIS_VIP_SYNCER_ENABLED}
744+
LICENSES_ITIS_VIP_SYNCER_ENABLED: ${LICENSES_ITIS_VIP_SYNCER_ENABLED}
745745
LICENSES_ITIS_VIP_SYNCER_PERIODICITY: ${LICENSES_ITIS_VIP_SYNCER_PERIODICITY}
746746
LICENSES_ITIS_VIP_API_URL: ${LICENSES_ITIS_VIP_API_URL}
747747
LICENSES_ITIS_VIP_CATEGORIES: ${LICENSES_ITIS_VIP_CATEGORIES}
748748
LICENSES_SPEAG_PHANTOMS_API_URL: ${LICENSES_SPEAG_PHANTOMS_API_URL}
749749
LICENSES_SPEAG_PHANTOMS_CATEGORIES: ${LICENSES_SPEAG_PHANTOMS_CATEGORIES}
750750

751-
752751
WEBSERVER_LOGIN: ${WEBSERVER_LOGIN}
753752
LOGIN_ACCOUNT_DELETION_RETENTION_DAYS: ${LOGIN_ACCOUNT_DELETION_RETENTION_DAYS}
754753
LOGIN_REGISTRATION_CONFIRMATION_REQUIRED: ${LOGIN_REGISTRATION_CONFIRMATION_REQUIRED}
@@ -826,7 +825,6 @@ services:
826825
PROJECTS_MAX_COPY_SIZE_BYTES: ${PROJECTS_MAX_COPY_SIZE_BYTES}
827826
PROJECTS_MAX_NUM_RUNNING_DYNAMIC_NODES: ${PROJECTS_MAX_NUM_RUNNING_DYNAMIC_NODES}
828827

829-
830828
# WEBSERVER_RABBITMQ
831829
RABBIT_HOST: ${RABBIT_HOST}
832830
RABBIT_PASSWORD: ${RABBIT_PASSWORD}
@@ -837,7 +835,6 @@ services:
837835
# WEBSERVER_TRASH
838836
TRASH_RETENTION_DAYS: ${TRASH_RETENTION_DAYS}
839837

840-
841838
# ARBITRARY ENV VARS
842839

843840
# see [https://docs.gunicorn.org/en/stable/settings.html#timeout],
@@ -868,18 +865,43 @@ services:
868865
- traefik.http.services.${SWARM_STACK_NAME}_webserver.loadbalancer.healthcheck.path=/v0/
869866
- traefik.http.services.${SWARM_STACK_NAME}_webserver.loadbalancer.healthcheck.interval=2000ms
870867
- traefik.http.services.${SWARM_STACK_NAME}_webserver.loadbalancer.healthcheck.timeout=1000ms
871-
# NOTE: stickyness must remain until the long running tasks in the webserver are removed
872-
# and also https://github.com/ITISFoundation/osparc-simcore/pull/4180 is resolved.
873-
- traefik.http.services.${SWARM_STACK_NAME}_webserver.loadbalancer.sticky.cookie=true
874-
- traefik.http.services.${SWARM_STACK_NAME}_webserver.loadbalancer.sticky.cookie.samesite=lax
875-
- traefik.http.services.${SWARM_STACK_NAME}_webserver.loadbalancer.sticky.cookie.httponly=true
876-
- traefik.http.services.${SWARM_STACK_NAME}_webserver.loadbalancer.sticky.cookie.secure=true
868+
# NOTE: stickyness must remain only for specific endpoints, see https://github.com/ITISFoundation/osparc-simcore/pull/4180
877869
- traefik.http.middlewares.${SWARM_STACK_NAME}_webserver_retry.retry.attempts=2
878870
- traefik.http.routers.${SWARM_STACK_NAME}_webserver.service=${SWARM_STACK_NAME}_webserver
879871
- traefik.http.routers.${SWARM_STACK_NAME}_webserver.rule=(Path(`/`) || Path(`/v0`) || Path(`/socket.io/`) || Path(`/static-frontend-data.json`) || PathRegexp(`^/study/(?P<study_uuid>\b[0-9a-f]{8}\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\b[0-9a-f]{12}\b)`) || Path(`/view`) || Path(`/#/view`) || Path(`/#/error`) || PathPrefix(`/v0/`))
880872
- traefik.http.routers.${SWARM_STACK_NAME}_webserver.entrypoints=http
881873
- traefik.http.routers.${SWARM_STACK_NAME}_webserver.priority=6
882874
- traefik.http.routers.${SWARM_STACK_NAME}_webserver.middlewares=${SWARM_STACK_NAME}_gzip@swarm, ${SWARM_STACK_NAME_NO_HYPHEN}_sslheader@swarm, ${SWARM_STACK_NAME}_webserver_retry
875+
# Sticky cookie only for specific endpoints
876+
- traefik.http.middlewares.${SWARM_STACK_NAME}_webserver_sticky_cookie.sticky.cookie=true
877+
- traefik.http.middlewares.${SWARM_STACK_NAME}_webserver_sticky_cookie.sticky.cookie.samesite=lax
878+
- traefik.http.middlewares.${SWARM_STACK_NAME}_webserver_sticky_cookie.sticky.cookie.httponly=true
879+
- traefik.http.middlewares.${SWARM_STACK_NAME}_webserver_sticky_cookie.sticky.cookie.secure=true
880+
# Per-endpoint routers for sticky cookie
881+
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky_projects.rule=Path(`/v0/projects`)
882+
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky_projects.entrypoints=http
883+
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky_projects.service=${SWARM_STACK_NAME}_webserver
884+
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky_projects.middlewares=${SWARM_STACK_NAME}_gzip@swarm, ${SWARM_STACK_NAME_NO_HYPHEN}_sslheader@swarm, ${SWARM_STACK_NAME}_webserver_sticky_cookie, ${SWARM_STACK_NAME}_webserver_retry
885+
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky_projects_clone.rule=Path(`/v0/projects:clone`)
886+
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky_projects_clone.entrypoints=http
887+
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky_projects_clone.service=${SWARM_STACK_NAME}_webserver
888+
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky_projects_clone.middlewares=${SWARM_STACK_NAME}_gzip@swarm, ${SWARM_STACK_NAME_NO_HYPHEN}_sslheader@swarm, ${SWARM_STACK_NAME}_webserver_sticky_cookie, ${SWARM_STACK_NAME}_webserver_retry
889+
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky_project_node_stop.rule=PathRegexp(`^/v0/projects/[0-9a-fA-F-]+/nodes/[0-9a-fA-F-]+:stop$`)
890+
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky_project_node_stop.entrypoints=http
891+
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky_project_node_stop.service=${SWARM_STACK_NAME}_webserver
892+
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky_project_node_stop.middlewares=${SWARM_STACK_NAME}_gzip@swarm, ${SWARM_STACK_NAME_NO_HYPHEN}_sslheader@swarm, ${SWARM_STACK_NAME}_webserver_sticky_cookie, ${SWARM_STACK_NAME}_webserver_retry
893+
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky_storage_size.rule=PathRegexp(`^/v0/storage/locations/[0-9]+/paths/.+:size$`)
894+
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky_storage_size.entrypoints=http
895+
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky_storage_size.service=${SWARM_STACK_NAME}_webserver
896+
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky_storage_size.middlewares=${SWARM_STACK_NAME}_gzip@swarm, ${SWARM_STACK_NAME_NO_HYPHEN}_sslheader@swarm, ${SWARM_STACK_NAME}_webserver_sticky_cookie, ${SWARM_STACK_NAME}_webserver_retry
897+
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky_storage_batch_delete.rule=PathRegexp(`^/v0/storage/locations/[0-9]+/-/paths:batchDelete$`)
898+
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky_storage_batch_delete.entrypoints=http
899+
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky_storage_batch_delete.service=${SWARM_STACK_NAME}_webserver
900+
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky_storage_batch_delete.middlewares=${SWARM_STACK_NAME}_gzip@swarm, ${SWARM_STACK_NAME_NO_HYPHEN}_sslheader@swarm, ${SWARM_STACK_NAME}_webserver_sticky_cookie, ${SWARM_STACK_NAME}_webserver_retry
901+
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky_storage_export_data.rule=PathRegexp(`^/v0/storage/locations/[0-9]+/export-data$`)
902+
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky_storage_export_data.entrypoints=http
903+
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky_storage_export_data.service=${SWARM_STACK_NAME}_webserver
904+
- traefik.http.routers.${SWARM_STACK_NAME}_webserver_sticky_storage_export_data.middlewares=${SWARM_STACK_NAME}_gzip@swarm, ${SWARM_STACK_NAME_NO_HYPHEN}_sslheader@swarm, ${SWARM_STACK_NAME}_webserver_sticky_cookie, ${SWARM_STACK_NAME}_webserver_retry
883905
networks: &webserver_networks
884906
- default
885907
- interactive_services_subnet
@@ -895,7 +917,6 @@ services:
895917
WEBSERVER_STATICWEB: "null"
896918
WEBSERVER_FUNCTIONS: ${WEBSERVER_FUNCTIONS} # needed for api-server
897919

898-
899920
networks: *webserver_networks
900921

901922
wb-db-event-listener:
@@ -927,7 +948,7 @@ services:
927948

928949
GUNICORN_CMD_ARGS: ${WEBSERVER_GUNICORN_CMD_ARGS}
929950
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
930-
LOG_FILTER_MAPPING : ${LOG_FILTER_MAPPING}
951+
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
931952
SWARM_STACK_NAME: ${SWARM_STACK_NAME}
932953
SESSION_SECRET_KEY: ${WEBSERVER_SESSION_SECRET_KEY}
933954
WEBSERVER_ACTIVITY: ${WB_DB_EL_ACTIVITY}
@@ -997,7 +1018,7 @@ services:
9971018

9981019
GUNICORN_CMD_ARGS: ${WEBSERVER_GUNICORN_CMD_ARGS}
9991020

1000-
LOG_FILTER_MAPPING : ${LOG_FILTER_MAPPING}
1021+
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
10011022
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
10021023

10031024
# WEBSERVER_DB
@@ -1076,7 +1097,6 @@ services:
10761097
WEBSERVER_USERS: ${WB_GC_USERS}
10771098
WEBSERVER_WALLETS: ${WB_GC_WALLETS}
10781099

1079-
10801100
networks:
10811101
- default
10821102
- interactive_services_subnet
@@ -1097,7 +1117,7 @@ services:
10971117
environment:
10981118
AGENT_LOGLEVEL: ${AGENT_LOGLEVEL}
10991119
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
1100-
LOG_FILTER_MAPPING : ${LOG_FILTER_MAPPING}
1120+
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
11011121
AGENT_VOLUMES_CLEANUP_S3_ENDPOINT: ${AGENT_VOLUMES_CLEANUP_S3_ENDPOINT}
11021122
AGENT_VOLUMES_CLEANUP_S3_REGION: ${AGENT_VOLUMES_CLEANUP_S3_REGION}
11031123
AGENT_VOLUMES_CLEANUP_S3_ACCESS_KEY: ${AGENT_VOLUMES_CLEANUP_S3_ACCESS_KEY}
@@ -1121,7 +1141,7 @@ services:
11211141
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
11221142

11231143
environment:
1124-
LOG_FILTER_MAPPING : ${LOG_FILTER_MAPPING}
1144+
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
11251145
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
11261146

11271147
NOTIFICATIONS_LOGLEVEL: ${NOTIFICATIONS_LOGLEVEL}
@@ -1143,7 +1163,6 @@ services:
11431163
TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
11441164
TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
11451165

1146-
11471166
dask-sidecar:
11481167
image: ${DOCKER_REGISTRY:-itisfoundation}/dask-sidecar:${DOCKER_IMAGE_TAG:-latest}
11491168
init: true
@@ -1164,7 +1183,7 @@ services:
11641183
DASK_TLS_CERT: ${DASK_TLS_CERT}
11651184
DASK_SCHEDULER_HOST: ${DASK_SCHEDULER_HOST:-dask-scheduler}
11661185
DASK_LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
1167-
DASK_LOG_FILTER_MAPPING : ${LOG_FILTER_MAPPING}
1186+
DASK_LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
11681187
DASK_SIDECAR_LOGLEVEL: ${DASK_SIDECAR_LOGLEVEL}
11691188
SIDECAR_COMP_SERVICES_SHARED_VOLUME_NAME: ${SWARM_STACK_NAME}_computational_shared_data
11701189
SIDECAR_COMP_SERVICES_SHARED_FOLDER: ${SIDECAR_COMP_SERVICES_SHARED_FOLDER:-/home/scu/computational_shared_data}
@@ -1196,7 +1215,7 @@ services:
11961215
networks:
11971216
- storage_subnet
11981217
environment:
1199-
DATCORE_ADAPTER_LOG_FILTER_MAPPING : ${LOG_FILTER_MAPPING}
1218+
DATCORE_ADAPTER_LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
12001219
DATCORE_ADAPTER_LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
12011220
DATCORE_ADAPTER_TRACING: ${DATCORE_ADAPTER_TRACING}
12021221
TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
@@ -1209,7 +1228,7 @@ services:
12091228
environment: &storage_environment
12101229
DATCORE_ADAPTER_HOST: ${DATCORE_ADAPTER_HOST:-datcore-adapter}
12111230
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
1212-
LOG_FILTER_MAPPING : ${LOG_FILTER_MAPPING}
1231+
LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}
12131232
POSTGRES_DB: ${POSTGRES_DB}
12141233
POSTGRES_ENDPOINT: ${POSTGRES_ENDPOINT}
12151234
POSTGRES_HOST: ${POSTGRES_HOST}
@@ -1344,19 +1363,7 @@ services:
13441363
# also aof (append only) is also enabled such that we get full durability at the expense
13451364
# of backup size. The backup is written into /data.
13461365
# https://redis.io/topics/persistence
1347-
[
1348-
"redis-server",
1349-
"--save",
1350-
"60 1",
1351-
"--loglevel",
1352-
"verbose",
1353-
"--databases",
1354-
"10",
1355-
"--appendonly",
1356-
"yes",
1357-
"--requirepass",
1358-
"${REDIS_PASSWORD}"
1359-
]
1366+
[ "redis-server", "--save", "60 1", "--loglevel", "verbose", "--databases", "10", "--appendonly", "yes", "--requirepass", "${REDIS_PASSWORD}" ]
13601367
networks:
13611368
- default
13621369
- autoscaling_subnet

0 commit comments

Comments
 (0)