bugfix: env in .xml not work

thongdanghoang · Feb 25, 2025 · 906d248 · 906d248
1 parent 577ed2a
commit 906d248
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/sep490-commons/springfw-impl/build.gradle b/sep490-commons/springfw-impl/build.gradle
@@ -21,6 +21,9 @@ configurations {
 	compileOnly {
 		extendsFrom annotationProcessor
 	}
+	all {
+		exclude group: 'org.springframework.boot', module: 'spring-boot-starter-logging'
+	}
 }
 
 repositories {

diff --git a/sep490-enterprise/src/main/resources/log4j2-spring.xml b/sep490-enterprise/src/main/resources/log4j2-spring.xml
@@ -7,19 +7,16 @@
         </Console>
         <SplunkHttp
                 name="splunkhttp"
-                url="${SPLUNK_URL}"
-                token="${ENTERPRISE_SPLUNK_TOKEN}"
-                host="${SPLUNK_HOST}"
-                index="${ENTERPRISE_SPLUNK_INDEX}"
-                source="${ENTERPRISE_SPLUNK_SOURCE}"
+                url="${env:SPLUNK_URL}"
+                token="${env:ENTERPRISE_SPLUNK_TOKEN}"
+                host="${env:SPLUNK_HOST}"
+                index="${env:ENTERPRISE_SPLUNK_INDEX}"
+                source="${env:ENTERPRISE_SPLUNK_SOURCE}"
                 type="raw"
                 sourcetype="log4j"
                 messageFormat="text"
                 disableCertificateValidation="true">
             <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c: %m%n"/>
-            <MetaData>
-                <Application>GreenBuildings Enterprise</Application>
-            </MetaData>
         </SplunkHttp>
     </Appenders>
 

diff --git a/sep490-idp/src/main/resources/log4j2-spring.xml b/sep490-idp/src/main/resources/log4j2-spring.xml
@@ -7,19 +7,16 @@
         </Console>
         <SplunkHttp
                 name="splunkhttp"
-                url="${SPLUNK_URL}"
-                token="${IDP_SPLUNK_TOKEN}"
-                host="${SPLUNK_HOST}"
-                index="${IDP_SPLUNK_INDEX}"
-                source="${IDP_SPLUNK_SOURCE}"
+                url="${env:SPLUNK_URL}"
+                token="${env:IDP_SPLUNK_TOKEN}"
+                host="${env:SPLUNK_HOST}"
+                index="${env:IDP_SPLUNK_INDEX}"
+                source="${env:IDP_SPLUNK_SOURCE}"
                 type="raw"
                 sourcetype="log4j"
                 messageFormat="text"
                 disableCertificateValidation="true">
             <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c: %m%n"/>
-            <MetaData>
-                <Application>GreenBuildings Identity Provider</Application>
-            </MetaData>
         </SplunkHttp>
     </Appenders>