Merge pull request #49 from CDOT-CV/docker-compose/adding-new-logging…

…-variables Added logging variables for PPM/ACM to docker-compose files & sample.env
CDOT-CV · Dec 26, 2023 · aa6fa65 · aa6fa65
2 parents 87ca65d + 466ed21
commit aa6fa65
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 0 deletions.
diff --git a/docker-compose-confluent-cloud.yml b/docker-compose-confluent-cloud.yml
@@ -46,6 +46,9 @@ services:
       CONFLUENT_KEY: ${CONFLUENT_KEY}
       CONFLUENT_SECRET: ${CONFLUENT_SECRET}
       ACM_CONFIG_FILE: adm.properties
+      ACM_LOG_TO_CONSOLE: ${ADM_LOG_TO_CONSOLE}
+      ACM_LOG_TO_FILE: ${ADM_LOG_TO_FILE}
+      ACM_LOG_LEVEL: ${ADM_LOG_LEVEL}
     volumes:
       - ${DOCKER_SHARED_VOLUME}:/asn1_codec_share
     logging:
@@ -62,6 +65,9 @@ services:
       CONFLUENT_KEY: ${CONFLUENT_KEY}
       CONFLUENT_SECRET: ${CONFLUENT_SECRET}
       ACM_CONFIG_FILE: aem.properties
+      ACM_LOG_TO_CONSOLE: ${AEM_LOG_TO_CONSOLE}
+      ACM_LOG_TO_FILE: ${AEM_LOG_TO_FILE}
+      ACM_LOG_LEVEL: ${AEM_LOG_LEVEL}
     volumes:
       - ${DOCKER_SHARED_VOLUME}:/asn1_codec_share
     logging:
@@ -79,6 +85,9 @@ services:
       CONFLUENT_KEY: ${CONFLUENT_KEY}
       CONFLUENT_SECRET: ${CONFLUENT_SECRET}
       PPM_CONFIG_FILE: cdot_ppmBsm.properties
+      PPM_LOG_TO_CONSOLE: ${PPM_BSM_LOG_TO_CONSOLE}
+      PPM_LOG_TO_FILE: ${PPM_BSM_LOG_TO_FILE}
+      PPM_LOG_LEVEL: ${PPM_BSM_LOG_LEVEL}
 
   ppmtim:
     build:
@@ -90,6 +99,9 @@ services:
       CONFLUENT_KEY: ${CONFLUENT_KEY}
       CONFLUENT_SECRET: ${CONFLUENT_SECRET}
       PPM_CONFIG_FILE: cdot_ppmTim.properties
+      PPM_LOG_TO_CONSOLE: ${PPM_TIM_LOG_TO_CONSOLE}
+      PPM_LOG_TO_FILE: ${PPM_TIM_LOG_TO_FILE}
+      PPM_LOG_LEVEL: ${PPM_TIM_LOG_LEVEL}
 
   cvpep_bsm_depositor:
     build: ./jpo-s3-deposit

diff --git a/docker-compose-ppm-nsv.yml b/docker-compose-ppm-nsv.yml
@@ -68,6 +68,9 @@ services:
     environment:
       DOCKER_HOST_IP: ${DOCKER_HOST_IP}
       ACM_CONFIG_FILE: adm.properties
+      ACM_LOG_TO_CONSOLE: ${ADM_LOG_TO_CONSOLE}
+      ACM_LOG_TO_FILE: ${ADM_LOG_TO_FILE}
+      ACM_LOG_LEVEL: ${ADM_LOG_LEVEL}
     depends_on:
       - kafka
     volumes:
@@ -79,6 +82,9 @@ services:
     environment:
       DOCKER_HOST_IP: ${DOCKER_HOST_IP}
       ACM_CONFIG_FILE: aem.properties
+      ACM_LOG_TO_CONSOLE: ${AEM_LOG_TO_CONSOLE}
+      ACM_LOG_TO_FILE: ${AEM_LOG_TO_FILE}
+      ACM_LOG_LEVEL: ${AEM_LOG_LEVEL}
     depends_on:
       - kafka
     volumes:
@@ -96,6 +102,9 @@ services:
       DOCKER_HOST_IP: ${DOCKER_HOST_IP}
       PPM_CONFIG_FILE: ${PPM_BSM_CONFIG_FILE}
       PPM_MAP_FILE: ${PPM_MAP_FILE}
+      PPM_LOG_TO_CONSOLE: ${PPM_BSM_LOG_TO_CONSOLE}
+      PPM_LOG_TO_FILE: ${PPM_BSM_LOG_TO_FILE}
+      PPM_LOG_LEVEL: ${PPM_BSM_LOG_LEVEL}
     volumes:
       - ${DOCKER_SHARED_VOLUME}/ppm_bsm:/ppm_data
     depends_on:
@@ -113,6 +122,9 @@ services:
       DOCKER_HOST_IP: ${DOCKER_HOST_IP}
       PPM_CONFIG_FILE: ${PPM_TIM_CONFIG_FILE}
       PPM_MAP_FILE: ${PPM_MAP_FILE}
+      PPM_LOG_TO_CONSOLE: ${PPM_TIM_LOG_TO_CONSOLE}
+      PPM_LOG_TO_FILE: ${PPM_TIM_LOG_TO_FILE}
+      PPM_LOG_LEVEL: ${PPM_TIM_LOG_LEVEL}
     volumes:
       - ${DOCKER_SHARED_VOLUME}/ppm_tim:/ppm_data
     depends_on:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -82,6 +82,9 @@ services:
     environment:
       DOCKER_HOST_IP: ${DOCKER_HOST_IP}
       ACM_CONFIG_FILE: adm.properties
+      ACM_LOG_TO_CONSOLE: ${ADM_LOG_TO_CONSOLE}
+      ACM_LOG_TO_FILE: ${ADM_LOG_TO_FILE}
+      ACM_LOG_LEVEL: ${ADM_LOG_LEVEL}
     depends_on:
       - kafka
     volumes:
@@ -97,6 +100,9 @@ services:
     environment:
       DOCKER_HOST_IP: ${DOCKER_HOST_IP}
       ACM_CONFIG_FILE: aem.properties
+      ACM_LOG_TO_CONSOLE: ${AEM_LOG_TO_CONSOLE}
+      ACM_LOG_TO_FILE: ${AEM_LOG_TO_FILE}
+      ACM_LOG_LEVEL: ${AEM_LOG_LEVEL}
     depends_on:
       - kafka
     volumes:
@@ -114,6 +120,9 @@ services:
     environment:
       DOCKER_HOST_IP: ${DOCKER_HOST_IP}
       PPM_CONFIG_FILE: ppmBsm.properties
+      PPM_LOG_TO_CONSOLE: ${PPM_BSM_LOG_TO_CONSOLE}
+      PPM_LOG_TO_FILE: ${PPM_BSM_LOG_TO_FILE}
+      PPM_LOG_LEVEL: ${PPM_BSM_LOG_LEVEL}
     volumes:
       - ${DOCKER_SHARED_VOLUME}:/ppm_data
     depends_on:
@@ -131,6 +140,9 @@ services:
     environment:
       DOCKER_HOST_IP: ${DOCKER_HOST_IP}
       PPM_CONFIG_FILE: ppmTim.properties
+      PPM_LOG_TO_CONSOLE: ${PPM_TIM_LOG_TO_CONSOLE}
+      PPM_LOG_TO_FILE: ${PPM_TIM_LOG_TO_FILE}
+      PPM_LOG_LEVEL: ${PPM_TIM_LOG_LEVEL}
     volumes:
       - ${DOCKER_SHARED_VOLUME}:/ppm_data
     depends_on:

diff --git a/sample.env b/sample.env
@@ -131,3 +131,19 @@ ODE_SECURITY_SVCS_SIGNATURE_URI=
 PPM_BSM_CONFIG_FILE=ppmBsm.properties
 PPM_TIM_CONFIG_FILE=ppmTim.properties
 PPM_MAP_FILE=I_80.edges
+
+# PPM Logging
+PPM_BSM_LOG_TO_CONSOLE=true
+PPM_BSM_LOG_TO_FILE=false
+PPM_BSM_LOG_LEVEL=INFO
+PPM_TIM_LOG_TO_FILE=false
+PPM_TIM_LOG_TO_CONSOLE=true
+PPM_TIM_LOG_LEVEL=INFO
+
+# ACM Logging
+AEM_LOG_TO_CONSOLE=true
+AEM_LOG_TO_FILE=false
+AEM_LOG_LEVEL=INFO
+ADM_LOG_TO_FILE=false
+ADM_LOG_TO_CONSOLE=true
+ADM_LOG_LEVEL=INFO