Skip to content

Commit 0e636bc

Browse files
fshimfshim
authored
Updated logback-spring.xml to fix system warnings, bump dependencies (#38)
* Updated logback-spring.xml to fix system warnings * bump dependencies
1 parent fbc7425 commit 0e636bc

File tree

4 files changed

+69
-65
lines changed

4 files changed

+69
-65
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ on:
77

88
jobs:
99
build:
10-
uses: valitydev/java-workflow/.github/workflows/maven-library-build.yml@v2
10+
uses: valitydev/java-workflow/.github/workflows/maven-library-build.yml@v3

‎.github/workflows/deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
deploy:
11-
uses: valitydev/java-workflow/.github/workflows/maven-library-deploy.yml@v2
11+
uses: valitydev/java-workflow/.github/workflows/maven-library-deploy.yml@v3
1212
secrets:
1313
server-username: ${{ secrets.OSSRH_USERNAME }}
1414
server-password: ${{ secrets.OSSRH_TOKEN }}

‎pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<groupId>dev.vality</groupId>
99
<artifactId>library-parent-pom</artifactId>
10-
<version>2.0.1</version>
10+
<version>3.0.1</version>
1111
</parent>
1212

1313
<artifactId>shared-resources</artifactId>
14-
<version>3.0.0</version>
14+
<version>3.0.1</version>
1515
<packaging>jar</packaging>
1616

1717
<name>Java shared resources</name>
@@ -42,13 +42,13 @@
4242
<dependency>
4343
<groupId>org.springframework.boot</groupId>
4444
<artifactId>spring-boot</artifactId>
45-
<version>2.7.5</version>
45+
<version>3.5.0</version>
4646
<scope>provided</scope>
4747
</dependency>
4848
<dependency>
4949
<groupId>net.logstash.logback</groupId>
5050
<artifactId>logstash-logback-encoder</artifactId>
51-
<version>7.2</version>
51+
<version>8.1</version>
5252
</dependency>
5353
<dependency>
5454
<groupId>org.codehaus.janino</groupId>

‎src/main/resources/logback-spring.xml‎

Lines changed: 63 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -4,67 +4,71 @@
44
<springProperty scope="context" name="logbackAppender" source="logback.appender" defaultValue="COLOR_CONSOLE"/>
55
<springProperty scope="context" name="loggingLevelRoot" source="logging.level.root" defaultValue="INFO"/>
66

7-
<appender name="DEFAULT_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
8-
<encoder>
9-
<pattern>${CONSOLE_LOG_PATTERN}</pattern>
10-
<charset>${CONSOLE_LOG_CHARSET}</charset>
11-
</encoder>
12-
</appender>
13-
14-
<appender name="COLOR_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
15-
<layout class="ch.qos.logback.classic.PatternLayout">
16-
<Pattern>
17-
%black(%d{ISO8601}) [%blue(%t)] %magenta(${PID:- }) %highlight(%-5level) %cyan(%logger{36}).%yellow(%M):%white(%L) — %m%n%wEx
18-
</Pattern>
19-
</layout>
20-
</appender>
21-
22-
<appender name="JSON_K8S_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
23-
<encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
24-
<providers>
25-
<mdc/>
26-
<pattern>
7+
<if condition='"${logbackAppender}".equals("COLOR_CONSOLE")'>
8+
<then>
9+
<appender name="COLOR_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
10+
<encoder>
2711
<pattern>
28-
{
29-
"@timestamp": "%date{yyy-MM-dd'T'HH:mm:ss.SSSXXX, UTC}",
30-
"@severity": "%level",
31-
"thread_name": "%thread",
32-
"logger_name": "%logger",
33-
"message": "%message"
34-
}
12+
%black(%d{ISO8601}) [%blue(%t)] %magenta(${PID:- }) %highlight(%-5level) %cyan(%logger{36}).%yellow(%M):%white(%L) — %m%n%wEx
3513
</pattern>
36-
</pattern>
37-
<stackTrace>
38-
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
39-
<maxDepthPerThrowable>30</maxDepthPerThrowable>
40-
<maxLength>2048</maxLength>
41-
<shortenedClassNameLength>20</shortenedClassNameLength>
42-
<exclude>^sun\.reflect\..*\.invoke</exclude>
43-
<exclude>^net\.sf\.cglib\.proxy\.MethodProxy\.invoke</exclude>
44-
<rootCauseFirst>true</rootCauseFirst>
45-
</throwableConverter>
46-
</stackTrace>
47-
</providers>
48-
</encoder>
49-
</appender>
14+
</encoder>
15+
</appender>
5016

51-
<root level="${loggingLevelRoot}">
52-
<if condition='"${logbackAppender}".equals("COLOR_CONSOLE")'>
53-
<then>
17+
<root level="${loggingLevelRoot}">
5418
<appender-ref ref="COLOR_CONSOLE"/>
55-
</then>
56-
<else>
57-
<if condition='"${logbackAppender}".equals("JSON_K8S_CONSOLE")'>
58-
<then>
59-
<appender-ref ref="JSON_K8S_CONSOLE"/>
60-
</then>
61-
<else>
62-
<appender-ref ref="DEFAULT_CONSOLE"/>
63-
</else>
64-
</if>
65-
</else>
66-
</if>
67-
</root>
19+
</root>
20+
</then>
21+
</if>
22+
23+
<if condition='"${logbackAppender}".equals("DEFAULT_CONSOLE")'>
24+
<then>
25+
<appender name="DEFAULT_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
26+
<encoder>
27+
<pattern>${CONSOLE_LOG_PATTERN}</pattern>
28+
<charset>${CONSOLE_LOG_CHARSET}</charset>
29+
</encoder>
30+
</appender>
31+
32+
<root level="${loggingLevelRoot}">
33+
<appender-ref ref="DEFAULT_CONSOLE"/>
34+
</root>
35+
</then>
36+
</if>
37+
38+
<if condition='"${logbackAppender}".equals("JSON_K8S_CONSOLE")'>
39+
<then>
40+
<appender name="JSON_K8S_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
41+
<encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
42+
<providers>
43+
<mdc/>
44+
<pattern>
45+
<pattern>
46+
{
47+
"@timestamp": "%date{yyy-MM-dd'T'HH:mm:ss.SSSXXX, UTC}",
48+
"@severity": "%level",
49+
"thread_name": "%thread",
50+
"logger_name": "%logger",
51+
"message": "%message"
52+
}
53+
</pattern>
54+
</pattern>
55+
<stackTrace>
56+
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
57+
<maxDepthPerThrowable>30</maxDepthPerThrowable>
58+
<maxLength>2048</maxLength>
59+
<shortenedClassNameLength>20</shortenedClassNameLength>
60+
<exclude>^sun\.reflect\..*\.invoke</exclude>
61+
<exclude>^net\.sf\.cglib\.proxy\.MethodProxy\.invoke</exclude>
62+
<rootCauseFirst>true</rootCauseFirst>
63+
</throwableConverter>
64+
</stackTrace>
65+
</providers>
66+
</encoder>
67+
</appender>
6868

69-
<jmxConfigurator/>
70-
</configuration>
69+
<root level="${loggingLevelRoot}">
70+
<appender-ref ref="JSON_K8S_CONSOLE"/>
71+
</root>
72+
</then>
73+
</if>
74+
</configuration>

0 commit comments

Comments
 (0)