moved logging config to java tool options #EA-3566

europeana · Oct 6, 2023 · 9b3e41f · 9b3e41f
1 parent d4af94c
commit 9b3e41f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/k8s/base/deployment.yaml b/k8s/base/deployment.yaml
@@ -16,6 +16,7 @@ spec:
             value: "/opt/app/config/translation.user.properties"
           - name: GOOGLE_APPLICATION_CREDENTIALS
             value: "/opt/app/config/google-auth.json"
+
           ports:
             - containerPort: 8080
           livenessProbe:

diff --git a/k8s/overlays/cloud/deployment_patch.yaml.template b/k8s/overlays/cloud/deployment_patch.yaml.template
@@ -14,13 +14,14 @@ spec:
         - name: translation-api
           imagePullPolicy: Always
           env:
-            - name: CATALINA_OPTS
+            - name: JAVA_TOOL_OPTIONS
               value: "-javaagent:/usr/local/elastic-apm-agent.jar
                       -Delastic.apm.application_packages=${ELASTIC_APP_PACKAGES}
                       -Delastic.apm.server_urls=${ELASTIC_APM_SERVERS}
                       -Delastic.apm.service_name=${APP_NAME}
                       -Delastic.apm.enabled=${COLLECT_APM}
-                      -Delastic.apm.environment=${K8S_NAMESPACE}"
+                      -Delastic.apm.environment=${K8S_NAMESPACE}
+                      -Dlogging.config=/opt/app/config/log4j2-spring.xml"
           resources:
             requests:
               memory: "${MEMORY_REQUEST}M"

diff --git a/translation-web/src/main/resources/application.properties b/translation-web/src/main/resources/application.properties
@@ -10,10 +10,6 @@ info.app.description=Europeana Translation API provides access to language detec
 #switch Spring boot logging to log4j (see https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#features.logging)
 org.springframework.boot.logging.LoggingSystem= org.springframework.boot.logging.log4j2.Log4J2LoggingSystem
 
-#location of log4j config (needs to be mounted at the same location in k8s)
-# need to have -spring suffix to allow extension (https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#features.logging.log4j2-extensions)
-logging.config=/opt/app/config/log4j2-spring.xml
-
 ## management / actuator / swagger
 #springfox.documentation.swagger-ui.enabled=true
 management.security.enabled=false