From bcb03a76ef99e45f0b683e182bee5f24b69acbe0 Mon Sep 17 00:00:00 2001 From: tyronechrisharris <142608718+tyronechrisharris@users.noreply.github.com> Date: Wed, 29 Apr 2026 11:31:12 +0000 Subject: [PATCH] Update log level to default to error across the system\n\n- Added LOG_LEVEL to .env.example\n- Updated docker-compose.yml to pass LOG_LEVEL to init-secrets, osh-postgis, osh-backend, and caddy proxies.\n- Replaced hardcoded info/debug/warn log levels with ${LOG_LEVEL:-error} in logback files. Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com> --- .env.example | 6 +++++ dist/config/standard/logback.xml | 12 +++++----- dist/release/launch-all.sh | 6 ++--- dist/release/launch-lan.sh | 6 ++--- dist/release/launch-mesh.sh | 6 ++--- docker-compose.yml | 23 ++++++++++++++++--- hivemq-config/logback.xml | 6 ++--- .../src/test/resources/logback-test.xml | 10 ++++---- .../dist/osh-base/config/logback.xml | 8 +++---- .../osh-rpi-geocam/src/config/logback.xml | 10 ++++---- .../dist/osh-sensiasoft/config/logback.xml | 8 +++---- .../src/test/resources/logback-test.xml | 8 +++---- .../src/test/resources/logback-test.xml | 6 ++--- .../src/test/resources/logback-test.xml | 6 ++--- .../src/test/resources/logback-test.xml | 8 +++---- .../src/test/resources/logback-test.xml | 6 ++--- .../src/test/resources/logback-test.xml | 10 ++++---- .../src/test/resources/logback-test.xml | 8 +++---- .../src/test/resources/logback-test.xml | 6 ++--- .../src/test/resources/logback-test.xml | 10 ++++---- .../src/test/resources/logback-test.xml | 6 ++--- .../src/test/resources/logback-test.xml | 6 ++--- .../src/main/resources/logback-test.xml | 14 +++++------ include/osh-core/dist/main/logback.xml | 8 +++---- include/osh-core/dist/osgi/logback.xml | 8 +++---- .../src/main/resources/logback.xml | 6 ++--- .../src/test/resources/logback-test.xml | 6 ++--- .../src/main/resources/logback.xml | 6 ++--- .../src/test/resources/logback-test.xml | 6 ++--- 29 files changed, 129 insertions(+), 106 deletions(-) diff --git a/.env.example b/.env.example index 8c5b74ce..6c7143c0 100644 --- a/.env.example +++ b/.env.example @@ -1,6 +1,12 @@ # OSCAR Node Deployment Environment Variables # ============================================================================== +# ============================================================================== +# Stack Logging Configuration +# Global logging level for all services: error, warn, info, debug, trace +# ============================================================================== +LOG_LEVEL=error + # OSCAR Image Version # By default, Docker Compose will pull the 'latest' stable production release. # If you are testing a specific PR build, uncomment the line below and set the PR tag. diff --git a/dist/config/standard/logback.xml b/dist/config/standard/logback.xml index dc2b229c..b85b76c1 100644 --- a/dist/config/standard/logback.xml +++ b/dist/config/standard/logback.xml @@ -23,19 +23,19 @@ - + - + - - + + - - + + diff --git a/dist/release/launch-all.sh b/dist/release/launch-all.sh index 02c2553a..22f4b31e 100755 --- a/dist/release/launch-all.sh +++ b/dist/release/launch-all.sh @@ -37,13 +37,13 @@ if [ ! -f "hivemq-config/logback.xml" ]; then - + - - + + INNER_EOF diff --git a/dist/release/launch-lan.sh b/dist/release/launch-lan.sh index 4da556c5..9f859b83 100755 --- a/dist/release/launch-lan.sh +++ b/dist/release/launch-lan.sh @@ -37,13 +37,13 @@ if [ ! -f "hivemq-config/logback.xml" ]; then - + - - + + INNER_EOF diff --git a/dist/release/launch-mesh.sh b/dist/release/launch-mesh.sh index cdf36e34..000e6777 100755 --- a/dist/release/launch-mesh.sh +++ b/dist/release/launch-mesh.sh @@ -37,13 +37,13 @@ if [ ! -f "hivemq-config/logback.xml" ]; then - + - - + + INNER_EOF diff --git a/docker-compose.yml b/docker-compose.yml index df81a30a..b5020bae 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,6 +2,8 @@ services: init-secrets: image: eclipse-temurin:21.0.6_7-jre-alpine container_name: oscar-init-secrets + environment: + - LOG_LEVEL=${LOG_LEVEL:-error} volumes: - oscar_secrets:/secrets - mtx_secrets:/mtx-secrets @@ -50,6 +52,7 @@ services: echo $$USER > /mtx-secrets/.mediamtx_api_user; echo "# MediaMTX Configuration for OSCAR (Auto-Generated)" > /mtx-secrets/mediamtx.yml; + echo "logLevel: $${LOG_LEVEL:-error}" >> /mtx-secrets/mediamtx.yml; echo "api: true" >> /mtx-secrets/mediamtx.yml; echo "apiAddress: :9997" >> /mtx-secrets/mediamtx.yml; echo "writeQueueSize: 1024" >> /mtx-secrets/mediamtx.yml; @@ -96,6 +99,8 @@ services: - "ssl_cert_file=/secrets/db-server.crt" - "-c" - "ssl_key_file=/secrets/db-server.key" + - "-c" + - "log_min_messages=${LOG_LEVEL:-error}" environment: - POSTGRES_DB=gis - POSTGRES_USER=postgres @@ -150,7 +155,7 @@ services: - MEDIAMTX_API_USER_FILE=/mtx_secrets/.mediamtx_api_user - MEDIAMTX_API_PASS_FILE=/mtx_secrets/.mediamtx_api_pass - MEDIAMTX_IP=${MEDIAMTX_IP:-host.docker.internal} - - JAVA_OPTS=-Xmx${BACKEND_JVM_HEAP:-2G} -Xms${BACKEND_JVM_HEAP:-2G} ${PROXY_OPTS:-} -DsocksNonProxyHosts=localhost|127.*|10.*|172.*|192.168.*|host.docker.internal -Dhttp.nonProxyHosts=localhost|127.*|10.*|172.*|192.168.*|host.docker.internal + - JAVA_OPTS=-Xmx${BACKEND_JVM_HEAP:-2G} -Xms${BACKEND_JVM_HEAP:-2G} ${PROXY_OPTS:-} -DLOG_LEVEL=${LOG_LEVEL:-error} -DsocksNonProxyHosts=localhost|127.*|10.*|172.*|192.168.*|host.docker.internal -Dhttp.nonProxyHosts=localhost|127.*|10.*|172.*|192.168.*|host.docker.internal volumes: - ./osh-node-oscar/config:/app/config - ./osh-node-oscar/db:/app/db @@ -232,6 +237,7 @@ services: environment: - TAILSCALE_DOMAIN=${TAILSCALE_DOMAIN:-invalid.local} - TAILSCALE_IP=${TAILSCALE_IP:-127.0.0.1} + - LOG_LEVEL=${LOG_LEVEL:-error} volumes: - caddy_data:/data - caddy_config:/config @@ -246,7 +252,12 @@ services: - /bin/sh - -c - | - echo ":80 {" > /etc/caddy/Caddyfile + echo "{" > /etc/caddy/Caddyfile + echo " log {" >> /etc/caddy/Caddyfile + echo " level $$LOG_LEVEL" >> /etc/caddy/Caddyfile + echo " }" >> /etc/caddy/Caddyfile + echo "}" >> /etc/caddy/Caddyfile + echo ":80 {" >> /etc/caddy/Caddyfile echo " @not_lan {" >> /etc/caddy/Caddyfile echo " not remote_ip private_ranges 127.0.0.1 ::1" >> /etc/caddy/Caddyfile echo " }" >> /etc/caddy/Caddyfile @@ -291,6 +302,7 @@ services: environment: - TAILSCALE_DOMAIN=${TAILSCALE_DOMAIN:-invalid.local} - TAILSCALE_IP=${TAILSCALE_IP:-127.0.0.1} + - LOG_LEVEL=${LOG_LEVEL:-error} volumes: - caddy_data:/data - caddy_config:/config @@ -304,7 +316,12 @@ services: - /bin/sh - -c - | - echo ":80 {" > /etc/caddy/Caddyfile + echo "{" > /etc/caddy/Caddyfile + echo " log {" >> /etc/caddy/Caddyfile + echo " level $$LOG_LEVEL" >> /etc/caddy/Caddyfile + echo " }" >> /etc/caddy/Caddyfile + echo "}" >> /etc/caddy/Caddyfile + echo ":80 {" >> /etc/caddy/Caddyfile echo " @not_lan {" >> /etc/caddy/Caddyfile echo " not remote_ip private_ranges 127.0.0.1 ::1" >> /etc/caddy/Caddyfile echo " }" >> /etc/caddy/Caddyfile diff --git a/hivemq-config/logback.xml b/hivemq-config/logback.xml index 86a1eb7c..210cf2f7 100644 --- a/hivemq-config/logback.xml +++ b/hivemq-config/logback.xml @@ -8,12 +8,12 @@ - + - - + + diff --git a/include/osh-addons/comm/sensorhub-comm-ble-dbus/src/test/resources/logback-test.xml b/include/osh-addons/comm/sensorhub-comm-ble-dbus/src/test/resources/logback-test.xml index d6d486fe..8ead96cc 100644 --- a/include/osh-addons/comm/sensorhub-comm-ble-dbus/src/test/resources/logback-test.xml +++ b/include/osh-addons/comm/sensorhub-comm-ble-dbus/src/test/resources/logback-test.xml @@ -5,11 +5,11 @@ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{0} - %msg%n - - - - - + + + + + \ No newline at end of file diff --git a/include/osh-addons/dist/osh-base/config/logback.xml b/include/osh-addons/dist/osh-base/config/logback.xml index 71cb294f..8291a33c 100644 --- a/include/osh-addons/dist/osh-base/config/logback.xml +++ b/include/osh-addons/dist/osh-base/config/logback.xml @@ -23,13 +23,13 @@ - + - + - - + + \ No newline at end of file diff --git a/include/osh-addons/dist/osh-rpi-geocam/src/config/logback.xml b/include/osh-addons/dist/osh-rpi-geocam/src/config/logback.xml index b6803df4..c887727d 100644 --- a/include/osh-addons/dist/osh-rpi-geocam/src/config/logback.xml +++ b/include/osh-addons/dist/osh-rpi-geocam/src/config/logback.xml @@ -23,14 +23,14 @@ - + - + - - - + + + \ No newline at end of file diff --git a/include/osh-addons/dist/osh-sensiasoft/config/logback.xml b/include/osh-addons/dist/osh-sensiasoft/config/logback.xml index e396486d..8291a33c 100644 --- a/include/osh-addons/dist/osh-sensiasoft/config/logback.xml +++ b/include/osh-addons/dist/osh-sensiasoft/config/logback.xml @@ -23,13 +23,13 @@ - + - + - - + + \ No newline at end of file diff --git a/include/osh-addons/sensors/avl/sensorhub-driver-avl-911/src/test/resources/logback-test.xml b/include/osh-addons/sensors/avl/sensorhub-driver-avl-911/src/test/resources/logback-test.xml index 572aef2c..e2dd40f5 100644 --- a/include/osh-addons/sensors/avl/sensorhub-driver-avl-911/src/test/resources/logback-test.xml +++ b/include/osh-addons/sensors/avl/sensorhub-driver-avl-911/src/test/resources/logback-test.xml @@ -5,10 +5,10 @@ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{0} - %msg%n - - - - + + + + \ No newline at end of file diff --git a/include/osh-addons/sensors/health/sensorhub-driver-angelsensor/src/test/resources/logback-test.xml b/include/osh-addons/sensors/health/sensorhub-driver-angelsensor/src/test/resources/logback-test.xml index 6aea53d6..da19e98e 100644 --- a/include/osh-addons/sensors/health/sensorhub-driver-angelsensor/src/test/resources/logback-test.xml +++ b/include/osh-addons/sensors/health/sensorhub-driver-angelsensor/src/test/resources/logback-test.xml @@ -5,9 +5,9 @@ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{0} - %msg%n - - - + + + \ No newline at end of file diff --git a/include/osh-addons/sensors/positioning/sensorhub-driver-bno055/src/test/resources/logback-test.xml b/include/osh-addons/sensors/positioning/sensorhub-driver-bno055/src/test/resources/logback-test.xml index 6aea53d6..da19e98e 100644 --- a/include/osh-addons/sensors/positioning/sensorhub-driver-bno055/src/test/resources/logback-test.xml +++ b/include/osh-addons/sensors/positioning/sensorhub-driver-bno055/src/test/resources/logback-test.xml @@ -5,9 +5,9 @@ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{0} - %msg%n - - - + + + \ No newline at end of file diff --git a/include/osh-addons/sensors/positioning/sensorhub-driver-gps-nmea/src/test/resources/logback-test.xml b/include/osh-addons/sensors/positioning/sensorhub-driver-gps-nmea/src/test/resources/logback-test.xml index 572aef2c..e2dd40f5 100644 --- a/include/osh-addons/sensors/positioning/sensorhub-driver-gps-nmea/src/test/resources/logback-test.xml +++ b/include/osh-addons/sensors/positioning/sensorhub-driver-gps-nmea/src/test/resources/logback-test.xml @@ -5,10 +5,10 @@ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{0} - %msg%n - - - - + + + + \ No newline at end of file diff --git a/include/osh-addons/sensors/positioning/sensorhub-driver-mti/src/test/resources/logback-test.xml b/include/osh-addons/sensors/positioning/sensorhub-driver-mti/src/test/resources/logback-test.xml index 6aea53d6..da19e98e 100644 --- a/include/osh-addons/sensors/positioning/sensorhub-driver-mti/src/test/resources/logback-test.xml +++ b/include/osh-addons/sensors/positioning/sensorhub-driver-mti/src/test/resources/logback-test.xml @@ -5,9 +5,9 @@ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{0} - %msg%n - - - + + + \ No newline at end of file diff --git a/include/osh-addons/sensors/robotics/sensorhub-driver-mavlink/src/test/resources/logback-test.xml b/include/osh-addons/sensors/robotics/sensorhub-driver-mavlink/src/test/resources/logback-test.xml index 0c60f366..f3a709d6 100644 --- a/include/osh-addons/sensors/robotics/sensorhub-driver-mavlink/src/test/resources/logback-test.xml +++ b/include/osh-addons/sensors/robotics/sensorhub-driver-mavlink/src/test/resources/logback-test.xml @@ -5,11 +5,11 @@ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{0} - %msg%n - - - - - + + + + + \ No newline at end of file diff --git a/include/osh-addons/sensors/robotics/sensorhub-driver-pwm-servos/src/test/resources/logback-test.xml b/include/osh-addons/sensors/robotics/sensorhub-driver-pwm-servos/src/test/resources/logback-test.xml index 572aef2c..e2dd40f5 100644 --- a/include/osh-addons/sensors/robotics/sensorhub-driver-pwm-servos/src/test/resources/logback-test.xml +++ b/include/osh-addons/sensors/robotics/sensorhub-driver-pwm-servos/src/test/resources/logback-test.xml @@ -5,10 +5,10 @@ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{0} - %msg%n - - - - + + + + \ No newline at end of file diff --git a/include/osh-addons/sensors/simulated/sensorhub-driver-plume/src/test/resources/logback-test.xml b/include/osh-addons/sensors/simulated/sensorhub-driver-plume/src/test/resources/logback-test.xml index 6aea53d6..da19e98e 100644 --- a/include/osh-addons/sensors/simulated/sensorhub-driver-plume/src/test/resources/logback-test.xml +++ b/include/osh-addons/sensors/simulated/sensorhub-driver-plume/src/test/resources/logback-test.xml @@ -5,9 +5,9 @@ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{0} - %msg%n - - - + + + \ No newline at end of file diff --git a/include/osh-addons/sensors/video/sensorhub-driver-rtpcam/src/test/resources/logback-test.xml b/include/osh-addons/sensors/video/sensorhub-driver-rtpcam/src/test/resources/logback-test.xml index eff01cb6..c7e1b004 100644 --- a/include/osh-addons/sensors/video/sensorhub-driver-rtpcam/src/test/resources/logback-test.xml +++ b/include/osh-addons/sensors/video/sensorhub-driver-rtpcam/src/test/resources/logback-test.xml @@ -5,11 +5,11 @@ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{0} - %msg%n - - - - - + + + + + \ No newline at end of file diff --git a/include/osh-addons/sensors/video/sensorhub-driver-v4l/src/test/resources/logback-test.xml b/include/osh-addons/sensors/video/sensorhub-driver-v4l/src/test/resources/logback-test.xml index 6aea53d6..da19e98e 100644 --- a/include/osh-addons/sensors/video/sensorhub-driver-v4l/src/test/resources/logback-test.xml +++ b/include/osh-addons/sensors/video/sensorhub-driver-v4l/src/test/resources/logback-test.xml @@ -5,9 +5,9 @@ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{0} - %msg%n - - - + + + \ No newline at end of file diff --git a/include/osh-addons/sensors/video/sensorhub-driver-virb-xe/src/test/resources/logback-test.xml b/include/osh-addons/sensors/video/sensorhub-driver-virb-xe/src/test/resources/logback-test.xml index 6aea53d6..da19e98e 100644 --- a/include/osh-addons/sensors/video/sensorhub-driver-virb-xe/src/test/resources/logback-test.xml +++ b/include/osh-addons/sensors/video/sensorhub-driver-virb-xe/src/test/resources/logback-test.xml @@ -5,9 +5,9 @@ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{0} - %msg%n - - - + + + \ No newline at end of file diff --git a/include/osh-addons/test/sensorhub-test/src/main/resources/logback-test.xml b/include/osh-addons/test/sensorhub-test/src/main/resources/logback-test.xml index c5352c91..edc1ce45 100644 --- a/include/osh-addons/test/sensorhub-test/src/main/resources/logback-test.xml +++ b/include/osh-addons/test/sensorhub-test/src/main/resources/logback-test.xml @@ -23,18 +23,18 @@ - + - + - + - - - - + + + + \ No newline at end of file diff --git a/include/osh-core/dist/main/logback.xml b/include/osh-core/dist/main/logback.xml index ef1b125e..2c1ac443 100644 --- a/include/osh-core/dist/main/logback.xml +++ b/include/osh-core/dist/main/logback.xml @@ -23,13 +23,13 @@ - + - + - - + + diff --git a/include/osh-core/dist/osgi/logback.xml b/include/osh-core/dist/osgi/logback.xml index 71cb294f..8291a33c 100644 --- a/include/osh-core/dist/osgi/logback.xml +++ b/include/osh-core/dist/osgi/logback.xml @@ -23,13 +23,13 @@ - + - + - - + + \ No newline at end of file diff --git a/include/osh-core/sensorhub-core-osgi/src/main/resources/logback.xml b/include/osh-core/sensorhub-core-osgi/src/main/resources/logback.xml index 834eca89..acd7812b 100644 --- a/include/osh-core/sensorhub-core-osgi/src/main/resources/logback.xml +++ b/include/osh-core/sensorhub-core-osgi/src/main/resources/logback.xml @@ -5,9 +5,9 @@ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{0} - %msg%n - - - + + + \ No newline at end of file diff --git a/include/osh-core/sensorhub-core-osgi/src/test/resources/logback-test.xml b/include/osh-core/sensorhub-core-osgi/src/test/resources/logback-test.xml index 6aea53d6..da19e98e 100644 --- a/include/osh-core/sensorhub-core-osgi/src/test/resources/logback-test.xml +++ b/include/osh-core/sensorhub-core-osgi/src/test/resources/logback-test.xml @@ -5,9 +5,9 @@ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{0} - %msg%n - - - + + + \ No newline at end of file diff --git a/include/osh-core/sensorhub-core/src/main/resources/logback.xml b/include/osh-core/sensorhub-core/src/main/resources/logback.xml index e0bcf2b1..acd7812b 100644 --- a/include/osh-core/sensorhub-core/src/main/resources/logback.xml +++ b/include/osh-core/sensorhub-core/src/main/resources/logback.xml @@ -5,9 +5,9 @@ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{0} - %msg%n - - - + + + \ No newline at end of file diff --git a/include/osh-core/sensorhub-core/src/test/resources/logback-test.xml b/include/osh-core/sensorhub-core/src/test/resources/logback-test.xml index 6aea53d6..da19e98e 100644 --- a/include/osh-core/sensorhub-core/src/test/resources/logback-test.xml +++ b/include/osh-core/sensorhub-core/src/test/resources/logback-test.xml @@ -5,9 +5,9 @@ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{0} - %msg%n - - - + + + \ No newline at end of file