Make default logback profile engage if the json-logs profile was not set

geoserver · Jun 20, 2024 · 438c822 · 438c822
1 parent c6bc5c9
commit 438c822
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/compose/.env b/compose/.env
@@ -8,9 +8,10 @@ GS_USER="1000:1000"
 GEOSERVER_BASE_PATH=/geoserver/cloud
 
 # logging profile, either "default" or "json-logs"
-LOGGING_PROFILE=json-logs
-
+#LOGGING_PROFILE=json-logs
+LOGGING_PROFILE=default
 GEOSERVER_DEFAULT_PROFILES="${LOGGING_PROFILE},acl"
+
 GATEWAY_DEFAULT_PROFILES=${LOGGING_PROFILE}
 DISCOVERY_SERVER_DEFAULT_PROFILES=${LOGGING_PROFILE}
 

diff --git a/config b/config
diff --git a/src/starters/observability/src/main/resources/logback-spring.xml b/src/starters/observability/src/main/resources/logback-spring.xml
@@ -1,6 +1,10 @@
 <configuration>
 
-  <springProfile name="default">
+  <springProfile name="!(json-logs)">
+    <!--
+     default logging profile, if you add more profiles besides json-logs (e.g. "custom"),
+     change name to name="!(json-logs|custom)"
+    -->
     <include resource="org/springframework/boot/logging/logback/base.xml" />
   </springProfile>