fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Polish formatting of log configuration file

Browse Source 
1. Remove space before `/>` to keep consistency.
2. Capitalize `filters` for Log4j2.
3. Uppercase log level to keep consistency.

See gh-43322
This commit is contained in:
Yanming Zhou 2024-11-29 11:25:47 +08:00 committed by Stéphane Nicoll
parent f13cf4d909
commit 3f17e42b38
13 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2-file.xml
View File

@ -20,22 +20,22 @@
<ThresholdFilter level="${sys:FILE_LOG_THRESHOLD:-TRACE}"/> <ThresholdFilter level="${sys:FILE_LOG_THRESHOLD:-TRACE}"/>
</Filters> </Filters>
<Policies> <Policies>
<SizeBasedTriggeringPolicy size="10 MB" /> <SizeBasedTriggeringPolicy size="10 MB"/>
</Policies> </Policies>
</RollingFile> </RollingFile>
</Appenders> </Appenders>
<Loggers> <Loggers>
<Logger name="org.apache.catalina.startup.DigesterFactory" level="error" /> <Logger name="org.apache.catalina.startup.DigesterFactory" level="ERROR"/>
<Logger name="org.apache.catalina.util.LifecycleBase" level="error" /> <Logger name="org.apache.catalina.util.LifecycleBase" level="ERROR"/>
<Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" /> <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="WARN"/>
<Logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/> <Logger name="org.apache.sshd.common.util.SecurityUtils" level="WARN"/>
<Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" /> <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="WARN"/>
<Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" /> <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="ERROR"/>
<Logger name="org.hibernate.validator.internal.util.Version" level="warn" /> <Logger name="org.hibernate.validator.internal.util.Version" level="WARN"/>
<Logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/> <Logger name="org.springframework.boot.actuate.endpoint.jmx" level="WARN"/>
<Root level="info"> <Root level="INFO">
<AppenderRef ref="Console" /> <AppenderRef ref="Console"/>
<AppenderRef ref="File" /> <AppenderRef ref="File"/>
</Root> </Root>
</Loggers> </Loggers>
</Configuration> </Configuration>

24
spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2.xml
View File

@ -10,22 +10,22 @@
<Appenders> <Appenders>
<Console name="Console" target="SYSTEM_OUT" follow="true"> <Console name="Console" target="SYSTEM_OUT" follow="true">
<PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" charset="${sys:CONSOLE_LOG_CHARSET}"/> <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" charset="${sys:CONSOLE_LOG_CHARSET}"/>
<filters> <Filters>
<ThresholdFilter level="${sys:CONSOLE_LOG_THRESHOLD:-TRACE}"/> <ThresholdFilter level="${sys:CONSOLE_LOG_THRESHOLD:-TRACE}"/>
</filters> </Filters>
</Console> </Console>
</Appenders> </Appenders>
<Loggers> <Loggers>
<Logger name="org.apache.catalina.startup.DigesterFactory" level="error" /> <Logger name="org.apache.catalina.startup.DigesterFactory" level="ERROR"/>
<Logger name="org.apache.catalina.util.LifecycleBase" level="error" /> <Logger name="org.apache.catalina.util.LifecycleBase" level="ERROR"/>
<Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" /> <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="WARN"/>
<Logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/> <Logger name="org.apache.sshd.common.util.SecurityUtils" level="WARN"/>
<Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" /> <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="WARN"/>
<Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" /> <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="ERROR"/>
<Logger name="org.hibernate.validator.internal.util.Version" level="warn" /> <Logger name="org.hibernate.validator.internal.util.Version" level="WARN"/>
<Logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/> <Logger name="org.springframework.boot.actuate.endpoint.jmx" level="WARN"/>
<Root level="info"> <Root level="INFO">
<AppenderRef ref="Console" /> <AppenderRef ref="Console"/>
</Root> </Root>
</Loggers> </Loggers>
</Configuration> </Configuration>

10
spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/base.xml
View File

@ -5,12 +5,12 @@ Base logback configuration provided for compatibility with Spring Boot 1.1
--> -->
<included> <included>
<include resource="org/springframework/boot/logging/logback/defaults.xml" /> <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
<property name="LOG_FILE" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/spring.log}"/> <property name="LOG_FILE" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/spring.log}"/>
<include resource="org/springframework/boot/logging/logback/console-appender.xml" /> <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
<include resource="org/springframework/boot/logging/logback/file-appender.xml" /> <include resource="org/springframework/boot/logging/logback/file-appender.xml"/>
<root level="INFO"> <root level="INFO">
<appender-ref ref="CONSOLE" /> <appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE" /> <appender-ref ref="FILE"/>
</root> </root>
</included> </included>

10
spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml
View File

@ -5,11 +5,11 @@ Default logback configuration provided for import
--> -->
<included> <included>
<conversionRule conversionWord="applicationName" class="org.springframework.boot.logging.logback.ApplicationNameConverter" /> <conversionRule conversionWord="applicationName" class="org.springframework.boot.logging.logback.ApplicationNameConverter"/>
<conversionRule conversionWord="clr" class="org.springframework.boot.logging.logback.ColorConverter" /> <conversionRule conversionWord="clr" class="org.springframework.boot.logging.logback.ColorConverter"/>
<conversionRule conversionWord="correlationId" class="org.springframework.boot.logging.logback.CorrelationIdConverter" /> <conversionRule conversionWord="correlationId" class="org.springframework.boot.logging.logback.CorrelationIdConverter"/>
<conversionRule conversionWord="wex" class="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" /> <conversionRule conversionWord="wex" class="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
<conversionRule conversionWord="wEx" class="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" /> <conversionRule conversionWord="wEx" class="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
<property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd'T'HH:mm:ss.SSSXXX}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr(%applicationName[%15.15t]){faint} %clr(${LOG_CORRELATION_PATTERN:-}){faint}%clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/> <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd'T'HH:mm:ss.SSSXXX}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr(%applicationName[%15.15t]){faint} %clr(${LOG_CORRELATION_PATTERN:-}){faint}%clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
<property name="CONSOLE_LOG_CHARSET" value="${CONSOLE_LOG_CHARSET:-${file.encoding:-UTF-8}}"/> <property name="CONSOLE_LOG_CHARSET" value="${CONSOLE_LOG_CHARSET:-${file.encoding:-UTF-8}}"/>

2
spring-boot-project/spring-boot/src/test/resources/logback-broken.xml
View File

@ -6,6 +6,6 @@
</encoder> </encoder>
</appender> </appender>
<root level="INFO"> <root level="INFO">
<appender-ref ref="CONSOLE" /> <appender-ref ref="CONSOLE"/>
</root> </root>
</configuration> </configuration>

2
spring-boot-project/spring-boot/src/test/resources/logback-include-defaults.xml
View File

@ -7,6 +7,6 @@
</encoder> </encoder>
</appender> </appender>
<root level="INFO"> <root level="INFO">
<appender-ref ref="CONSOLE" /> <appender-ref ref="CONSOLE"/>
</root> </root>
</configuration> </configuration>

2
spring-boot-project/spring-boot/src/test/resources/logback-janino.xml
View File

@ -13,6 +13,6 @@
</filter> </filter>
</appender> </appender>
<root level="INFO"> <root level="INFO">
<appender-ref ref="CONSOLE" /> <appender-ref ref="CONSOLE"/>
</root> </root>
</configuration> </configuration>

2
spring-boot-project/spring-boot/src/test/resources/logback-nondefault.xml
View File

@ -6,6 +6,6 @@
</encoder> </encoder>
</appender> </appender>
<root level="INFO"> <root level="INFO">
<appender-ref ref="CONSOLE" /> <appender-ref ref="CONSOLE"/>
</root> </root>
</configuration> </configuration>

2
spring-boot-project/spring-boot/src/test/resources/logback-springprofile-in-root.xml
View File

@ -7,7 +7,7 @@
</appender> </appender>
<root level="INFO"> <root level="INFO">
<springProfile name="profile"> <springProfile name="profile">
<appender-ref ref="CONSOLE" /> <appender-ref ref="CONSOLE"/>
</springProfile> </springProfile>
</root> </root>
</configuration> </configuration>

2
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/logback.xml
View File

@ -5,6 +5,6 @@
</encoder> </encoder>
</appender> </appender>
<root level="INFO"> <root level="INFO">
<appender-ref ref="STDOUT" /> <appender-ref ref="STDOUT"/>
</root> </root>
</configuration> </configuration>

6
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/src/main/resources/log4j2.xml
View File

@ -10,9 +10,9 @@
</Console> </Console>
</Appenders> </Appenders>
<Loggers> <Loggers>
<Logger name="org.hibernate.validator.internal.util.Version" level="warn" /> <Logger name="org.hibernate.validator.internal.util.Version" level="warn"/>
<Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" /> <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn"/>
<Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" /> <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn"/>
<Root level="info"> <Root level="info">
<AppenderRef ref="Console"/> <AppenderRef ref="Console"/>

4
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/resources/logback.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<include resource="org/springframework/boot/logging/logback/base.xml" /> <include resource="org/springframework/boot/logging/logback/base.xml"/>
<root level="INFO"> <root level="INFO">
<appender-ref ref="CONSOLE" /> <appender-ref ref="CONSOLE"/>
</root> </root>
</configuration> </configuration>

6
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-logback/src/main/resources/logback-spring.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<include resource="org/springframework/boot/logging/logback/base.xml" /> <include resource="org/springframework/boot/logging/logback/base.xml"/>
<logger name="smoketest.logback" level="DEBUG" /> <logger name="smoketest.logback" level="DEBUG"/>
<springProfile name="staging"> <springProfile name="staging">
<logger name="smoketest.logback" level="TRACE" /> <logger name="smoketest.logback" level="TRACE"/>
</springProfile> </springProfile>
</configuration> </configuration>