Skip to content

Commit 881a4a3

Browse files
quaffquaff
committed
Polish formatting of log configuration file
1. Remove space before `/>` to keep consistency. 2. Unwrap `<Filters>` for Log4j2. 3. Uppercase log level to keep consistency.
1 parent f3a161a commit 881a4a3

File tree

13 files changed

+50
-56
lines changed

13 files changed

+50
-56
lines changed

‎spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2-file.xml‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
<PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" charset="${sys:CONSOLE_LOG_CHARSET}"/>
1818
</DefaultArbiter>
1919
</Select>
20-
<Filters>
21-
<ThresholdFilter level="${sys:CONSOLE_LOG_THRESHOLD:-TRACE}"/>
22-
</Filters>
20+
<ThresholdFilter level="${sys:CONSOLE_LOG_THRESHOLD:-TRACE}"/>
2321
</Console>
2422
<RollingFile name="File" fileName="${sys:LOG_FILE}" filePattern="${sys:LOG_PATH}/$${date:yyyy-MM}/app-%d{yyyy-MM-dd-HH}-%i.log.gz">
2523
<Select>
@@ -30,26 +28,24 @@
3028
<PatternLayout pattern="${sys:FILE_LOG_PATTERN}" charset="${sys:FILE_LOG_CHARSET}"/>
3129
</DefaultArbiter>
3230
</Select>
33-
<Filters>
34-
<ThresholdFilter level="${sys:FILE_LOG_THRESHOLD:-TRACE}"/>
35-
</Filters>
31+
<ThresholdFilter level="${sys:FILE_LOG_THRESHOLD:-TRACE}"/>
3632
<Policies>
37-
<SizeBasedTriggeringPolicy size="10 MB" />
33+
<SizeBasedTriggeringPolicy size="10 MB"/>
3834
</Policies>
3935
</RollingFile>
4036
</Appenders>
4137
<Loggers>
42-
<Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
43-
<Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
44-
<Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
45-
<Logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
46-
<Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
47-
<Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
48-
<Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
49-
<Logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
50-
<Root level="info">
51-
<AppenderRef ref="Console" />
52-
<AppenderRef ref="File" />
38+
<Logger name="org.apache.catalina.startup.DigesterFactory" level="ERROR"/>
39+
<Logger name="org.apache.catalina.util.LifecycleBase" level="ERROR"/>
40+
<Logger name="org.apache.coyote.http11.Http11NioProtocol" level="WARN"/>
41+
<Logger name="org.apache.sshd.common.util.SecurityUtils" level="WARN"/>
42+
<Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="WARN"/>
43+
<Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="ERROR"/>
44+
<Logger name="org.hibernate.validator.internal.util.Version" level="WARN"/>
45+
<Logger name="org.springframework.boot.actuate.endpoint.jmx" level="WARN"/>
46+
<Root level="INFO">
47+
<AppenderRef ref="Console"/>
48+
<AppenderRef ref="File"/>
5349
</Root>
5450
</Loggers>
5551
</Configuration>

‎spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/log4j2/log4j2.xml‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,20 @@
1717
<PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" charset="${sys:CONSOLE_LOG_CHARSET}"/>
1818
</DefaultArbiter>
1919
</Select>
20-
<filters>
21-
<ThresholdFilter level="${sys:CONSOLE_LOG_THRESHOLD:-TRACE}"/>
22-
</filters>
20+
<ThresholdFilter level="${sys:CONSOLE_LOG_THRESHOLD:-TRACE}"/>
2321
</Console>
2422
</Appenders>
2523
<Loggers>
26-
<Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
27-
<Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
28-
<Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
29-
<Logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
30-
<Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
31-
<Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
32-
<Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
33-
<Logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
34-
<Root level="info">
35-
<AppenderRef ref="Console" />
24+
<Logger name="org.apache.catalina.startup.DigesterFactory" level="ERROR"/>
25+
<Logger name="org.apache.catalina.util.LifecycleBase" level="ERROR"/>
26+
<Logger name="org.apache.coyote.http11.Http11NioProtocol" level="WARN"/>
27+
<Logger name="org.apache.sshd.common.util.SecurityUtils" level="WARN"/>
28+
<Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="WARN"/>
29+
<Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="ERROR"/>
30+
<Logger name="org.hibernate.validator.internal.util.Version" level="WARN"/>
31+
<Logger name="org.springframework.boot.actuate.endpoint.jmx" level="WARN"/>
32+
<Root level="INFO">
33+
<AppenderRef ref="Console"/>
3634
</Root>
3735
</Loggers>
3836
</Configuration>

‎spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/base.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ Base logback configuration provided for compatibility with Spring Boot 1.1
55
-->
66

77
<included>
8-
<include resource="org/springframework/boot/logging/logback/defaults.xml" />
8+
<include resource="org/springframework/boot/logging/logback/defaults.xml"/>
99
<property name="LOG_FILE" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/spring.log}"/>
10-
<include resource="org/springframework/boot/logging/logback/console-appender.xml" />
11-
<include resource="org/springframework/boot/logging/logback/file-appender.xml" />
10+
<include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
11+
<include resource="org/springframework/boot/logging/logback/file-appender.xml"/>
1212
<root level="INFO">
13-
<appender-ref ref="CONSOLE" />
14-
<appender-ref ref="FILE" />
13+
<appender-ref ref="CONSOLE"/>
14+
<appender-ref ref="FILE"/>
1515
</root>
1616
</included>

‎spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ Default logback configuration provided for import
55
-->
66

77
<included>
8-
<conversionRule conversionWord="applicationName" class="org.springframework.boot.logging.logback.ApplicationNameConverter" />
9-
<conversionRule conversionWord="clr" class="org.springframework.boot.logging.logback.ColorConverter" />
10-
<conversionRule conversionWord="correlationId" class="org.springframework.boot.logging.logback.CorrelationIdConverter" />
11-
<conversionRule conversionWord="esb" class="org.springframework.boot.logging.logback.EnclosedInSquareBracketsConverter" />
12-
<conversionRule conversionWord="wex" class="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
13-
<conversionRule conversionWord="wEx" class="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
8+
<conversionRule conversionWord="applicationName" class="org.springframework.boot.logging.logback.ApplicationNameConverter"/>
9+
<conversionRule conversionWord="clr" class="org.springframework.boot.logging.logback.ColorConverter"/>
10+
<conversionRule conversionWord="correlationId" class="org.springframework.boot.logging.logback.CorrelationIdConverter"/>
11+
<conversionRule conversionWord="esb" class="org.springframework.boot.logging.logback.EnclosedInSquareBracketsConverter"/>
12+
<conversionRule conversionWord="wex" class="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
13+
<conversionRule conversionWord="wEx" class="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
1414

1515
<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(--- %esb(){APPLICATION_NAME}%esb{APPLICATION_GROUP}[%15.15t] ${LOG_CORRELATION_PATTERN:-}){faint}%clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
1616
<property name="CONSOLE_LOG_CHARSET" value="${CONSOLE_LOG_CHARSET:-${file.encoding:-UTF-8}}"/>

‎spring-boot-project/spring-boot/src/test/resources/logback-broken.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
</encoder>
77
</appender>
88
<root level="INFO">
9-
<appender-ref ref="CONSOLE" />
9+
<appender-ref ref="CONSOLE"/>
1010
</root>
1111
</configuration>

‎spring-boot-project/spring-boot/src/test/resources/logback-include-defaults.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
</encoder>
88
</appender>
99
<root level="INFO">
10-
<appender-ref ref="CONSOLE" />
10+
<appender-ref ref="CONSOLE"/>
1111
</root>
1212
</configuration>

‎spring-boot-project/spring-boot/src/test/resources/logback-janino.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
</filter>
1414
</appender>
1515
<root level="INFO">
16-
<appender-ref ref="CONSOLE" />
16+
<appender-ref ref="CONSOLE"/>
1717
</root>
1818
</configuration>

‎spring-boot-project/spring-boot/src/test/resources/logback-nondefault.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
</encoder>
77
</appender>
88
<root level="INFO">
9-
<appender-ref ref="CONSOLE" />
9+
<appender-ref ref="CONSOLE"/>
1010
</root>
1111
</configuration>

‎spring-boot-project/spring-boot/src/test/resources/logback-springprofile-in-root.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</appender>
88
<root level="INFO">
99
<springProfile name="profile">
10-
<appender-ref ref="CONSOLE" />
10+
<appender-ref ref="CONSOLE"/>
1111
</springProfile>
1212
</root>
1313
</configuration>

‎spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/dockerTest/resources/logback.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
</encoder>
66
</appender>
77
<root level="INFO">
8-
<appender-ref ref="STDOUT" />
8+
<appender-ref ref="STDOUT"/>
99
</root>
1010
</configuration>

0 commit comments

Comments
 (0)