Skip to content

Commit 692f93f

Browse files
authored
Merge pull request #71 from gerry-f2c/pr@v3@perf_log_format
perf: Optimize log format
2 parents 2054095 + a4fb744 commit 692f93f

File tree

4 files changed

+30
-5
lines changed

4 files changed

+30
-5
lines changed

Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ COPY --from=stage-chen-build /opt/chen/backend/web/target/web-*.jar /opt/chen/ch
7777
COPY --from=stage-chen-build /opt/chen/entrypoint.sh .
7878
COPY --from=stage-chen-build /opt/chen/drivers /opt/chen/drivers
7979
COPY --from=stage-chen-build /opt/chen/config/application.yml /opt/chen/config/application.yml
80+
COPY --from=stage-chen-build /opt/chen/config/logback.xml /opt/chen/config/logback.xml
8081

8182
ARG VERSION
8283
ENV VERSION=$VERSION

config/application.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ server:
88
enabled: true
99

1010
logging:
11-
level:
12-
root: INFO
13-
file:
14-
name: data/logs/chen.log
11+
config: config/logback.xml
1512

1613
spring:
1714
messages:

config/logback.xml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<configuration debug="false">
3+
<property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss,Asia/Shanghai} [%-5level] [%thread] [%-30.30logger{30}] %msg%n"/>
4+
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
5+
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
6+
<pattern>%d{yyyy-MM-dd HH:mm:ss,Asia/Shanghai} [%thread] %-5level %logger - %msg%n</pattern>
7+
</encoder>
8+
</appender>
9+
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
10+
<file>data/logs/chen.log</file>
11+
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
12+
<FileNamePattern>data/logs/chen.log.%d{yyyy-MM-dd}.%i.gz</FileNamePattern>
13+
<maxFileSize>10MB</maxFileSize>
14+
<compressionMode>GZ</compressionMode>
15+
</rollingPolicy>
16+
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
17+
<pattern>%d{yyyy-MM-dd HH:mm:ss,Asia/Shanghai} [%thread] %-5level %logger - %msg%n</pattern>
18+
</encoder>
19+
</appender>
20+
21+
<logger name="org.springframework.*" level="INFO"/>
22+
<logger name="org.jumpserver.chen.*" level="INFO"/>
23+
<root level="INFO">
24+
<appender-ref ref="CONSOLE"/>
25+
<appender-ref ref="FILE"/>
26+
</root>
27+
</configuration>

entrypoint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if [ ! "$LOG_LEVEL" ]; then
1616
LOG_LEVEL=ERROR
1717
fi
1818

19-
sed -i "s@root: INFO@root: ${LOG_LEVEL}@g" /opt/chen/config/application.yml
19+
sed -i "s@level=\"INFO\"@level=\"${LOG_LEVEL}\"@g" /opt/chen/config/logback.xml
2020

2121
echo
2222
date

0 commit comments

Comments
 (0)