🐛 add LOG_FORMAT_LOCAL_DEV_ENABLED to the docker-compose (#4241)

ITISFoundation · May 16, 2023 · dab760d · dab760d
1 parent 5fc1a69
commit dab760d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/...2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/sidecar.py b/...2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/sidecar.py
@@ -58,7 +58,7 @@ def _get_environment_variables(
         "DY_SIDECAR_USER_ID": f"{scheduler_data.user_id}",
         "DYNAMIC_SIDECAR_COMPOSE_NAMESPACE": compose_namespace,
         "DYNAMIC_SIDECAR_LOG_LEVEL": app_settings.DYNAMIC_SERVICES.DYNAMIC_SIDECAR.DYNAMIC_SIDECAR_LOG_LEVEL,
-        "DIRECTOR_V2_LOG_FORMAT_LOCAL_DEV_ENABLED": f"{app_settings.DIRECTOR_V2_LOG_FORMAT_LOCAL_DEV_ENABLED}",
+        "DY_SIDECAR_LOG_FORMAT_LOCAL_DEV_ENABLED": f"{app_settings.DIRECTOR_V2_LOG_FORMAT_LOCAL_DEV_ENABLED}",
         "POSTGRES_DB": f"{app_settings.POSTGRES.POSTGRES_DB}",
         "POSTGRES_ENDPOINT": f"{app_settings.POSTGRES.POSTGRES_HOST}:{app_settings.POSTGRES.POSTGRES_PORT}",
         "POSTGRES_HOST": f"{app_settings.POSTGRES.POSTGRES_HOST}",

diff --git a/services/director-v2/tests/unit/test_modules_dynamic_sidecar_docker_service_specs_sidecar.py b/services/director-v2/tests/unit/test_modules_dynamic_sidecar_docker_service_specs_sidecar.py
@@ -24,9 +24,9 @@
     "DY_SIDECAR_STATE_PATHS",
     "DY_SIDECAR_USER_ID",
     "DY_SIDECAR_USER_SERVICES_HAVE_INTERNET_ACCESS",
+    "DY_SIDECAR_LOG_FORMAT_LOCAL_DEV_ENABLED",
     "DYNAMIC_SIDECAR_COMPOSE_NAMESPACE",
     "DYNAMIC_SIDECAR_LOG_LEVEL",
-    "DIRECTOR_V2_LOG_FORMAT_LOCAL_DEV_ENABLED",
     "POSTGRES_DB",
     "POSTGRES_ENDPOINT",
     "POSTGRES_HOST",

diff --git a/...ices/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_service_specs.py b/...ices/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_service_specs.py
@@ -187,7 +187,7 @@ def expected_dynamic_sidecar_spec(
                     "DY_SIDECAR_USER_SERVICES_HAVE_INTERNET_ACCESS": "False",
                     "FORWARD_ENV_DISPLAY": ":0",
                     "DYNAMIC_SIDECAR_LOG_LEVEL": "DEBUG",
-                    "DIRECTOR_V2_LOG_FORMAT_LOCAL_DEV_ENABLED": "False",
+                    "DY_SIDECAR_LOG_FORMAT_LOCAL_DEV_ENABLED": "False",
                     "POSTGRES_DB": "test",
                     "POSTGRES_HOST": "localhost",
                     "POSTGRES_PORT": "5432",

diff --git a/services/docker-compose.yml b/services/docker-compose.yml
@@ -7,6 +7,7 @@ services:
     environment:
       - WEBSERVER_HOST=${WEBSERVER_HOST:-webserver}
       - LOG_LEVEL=${LOG_LEVEL:-WARNING}
+      - LOG_FORMAT_LOCAL_DEV_ENABLED=${LOG_FORMAT_LOCAL_DEV_ENABLED}
     env_file:
       - ../.env
     deploy:
@@ -35,6 +36,7 @@ services:
       - autoscaling_subnet
     environment:
       - LOG_LEVEL=${LOG_LEVEL:-WARNING}
+      - LOG_FORMAT_LOCAL_DEV_ENABLED=${LOG_FORMAT_LOCAL_DEV_ENABLED}
       - REDIS_HOST=${REDIS_HOST}
       - REDIS_PORT=${REDIS_PORT}
     volumes:
@@ -64,6 +66,7 @@ services:
       - DIRECTOR_HOST=${DIRECTOR_HOST:-director}
       - DIRECTOR_PORT=${DIRECTOR_PORT:-8080}
       - LOG_LEVEL=${LOG_LEVEL:-WARNING}
+      - LOG_FORMAT_LOCAL_DEV_ENABLED=${LOG_FORMAT_LOCAL_DEV_ENABLED}
       - POSTGRES_DB=${POSTGRES_DB}
       - POSTGRES_HOST=${POSTGRES_HOST}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
@@ -140,6 +143,7 @@ services:
       - DYNAMIC_SIDECAR_IMAGE=${DOCKER_REGISTRY:-itisfoundation}/dynamic-sidecar:${DOCKER_IMAGE_TAG:-latest}
       - EXTRA_HOSTS_SUFFIX=${EXTRA_HOSTS_SUFFIX:-undefined}
       - LOG_LEVEL=${LOG_LEVEL:-WARNING}
+      - LOG_FORMAT_LOCAL_DEV_ENABLED=${LOG_FORMAT_LOCAL_DEV_ENABLED}
       - S3_ACCESS_KEY=${S3_ACCESS_KEY}
       - S3_BUCKET_NAME=${S3_BUCKET_NAME}
       - S3_ENDPOINT=${S3_ENDPOINT}
@@ -174,6 +178,7 @@ services:
       - INVITATIONS_OSPARC_URL=${INVITATIONS_OSPARC_URL}
       - INVITATIONS_USERNAME=${INVITATIONS_USERNAME}
       - INVITATIONS_PASSWORD=${INVITATIONS_PASSWORD}
+      - LOG_FORMAT_LOCAL_DEV_ENABLED=${LOG_FORMAT_LOCAL_DEV_ENABLED}
 
   static-webserver:
     image: ${DOCKER_REGISTRY:-itisfoundation}/static-webserver:${DOCKER_IMAGE_TAG:-latest}
@@ -244,6 +249,7 @@ services:
       DIRECTOR_PORT: ${DIRECTOR_PORT:-8080}
       DIRECTOR_V2_HOST: ${DIRECTOR_V2_HOST:-director-v2}
       DIRECTOR_V2_PORT: ${DIRECTOR_V2_PORT:-8000}
+      LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
       STORAGE_HOST: ${STORAGE_HOST:-storage}
       STORAGE_PORT: ${STORAGE_PORT:-8080}
       SWARM_STACK_NAME: ${SWARM_STACK_NAME:-simcore}
@@ -317,6 +323,7 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
     environment:
       LOGLEVEL: ${LOG_LEVEL:-INFO}
+      LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
       AGENT_VOLUMES_CLEANUP_S3_SECURE: ${AGENT_VOLUMES_CLEANUP_S3_SECURE}
       AGENT_VOLUMES_CLEANUP_S3_ENDPOINT: ${AGENT_VOLUMES_CLEANUP_S3_ENDPOINT}
       AGENT_VOLUMES_CLEANUP_S3_ACCESS_KEY: ${AGENT_VOLUMES_CLEANUP_S3_ACCESS_KEY}
@@ -342,6 +349,7 @@ services:
     environment:
       &sidecar-environment
       DASK_SCHEDULER_HOST: ${DASK_SCHEDULER_HOST:-dask-scheduler}
+      DASK_LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
       SIDECAR_LOGLEVEL: ${LOG_LEVEL:-WARNING}
       SIDECAR_COMP_SERVICES_SHARED_VOLUME_NAME: ${SWARM_STACK_NAME}_computational_shared_data
       SIDECAR_COMP_SERVICES_SHARED_FOLDER: ${SIDECAR_COMP_SERVICES_SHARED_FOLDER:-/home/scu/computational_shared_data}