Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added logging variables for PPM/ACM to docker-compose files & sample.env #49

Merged
merged 1 commit into from
Dec 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions docker-compose-confluent-cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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
Expand Down
12 changes: 12 additions & 0 deletions docker-compose-ppm-nsv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
12 changes: 12 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,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:
Expand All @@ -96,6 +99,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:
Expand All @@ -113,6 +119,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:
Expand All @@ -130,6 +139,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:
Expand Down
16 changes: 16 additions & 0 deletions sample.env
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading