This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch conf
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/conf by this push:
new af8ddbf9a [Improve] logback config improve
af8ddbf9a is described below
commit af8ddbf9abe584f2c122674e81b2cf2e0d04e6dc
Author: benjobs <[email protected]>
AuthorDate: Sat Mar 30 21:45:29 2024 +0800
[Improve] logback config improve
---
.../src/main/assembly/assembly.xml | 1 +
.../src/main/assembly/bin/streampark.sh | 2 +
.../resources/{logback-spring.xml => logback.xml} | 76 +++++++++++++++-------
3 files changed, 55 insertions(+), 24 deletions(-)
diff --git
a/streampark-console/streampark-console-service/src/main/assembly/assembly.xml
b/streampark-console/streampark-console-service/src/main/assembly/assembly.xml
index 9ea025f29..6d46c1a44 100644
---
a/streampark-console/streampark-console-service/src/main/assembly/assembly.xml
+++
b/streampark-console/streampark-console-service/src/main/assembly/assembly.xml
@@ -96,6 +96,7 @@
<fileMode>0755</fileMode>
<includes>
<include>config.yaml</include>
+ <include>logback.xml</include>
</includes>
</fileSet>
<fileSet>
diff --git
a/streampark-console/streampark-console-service/src/main/assembly/bin/streampark.sh
b/streampark-console/streampark-console-service/src/main/assembly/bin/streampark.sh
index 72e4bd32e..41b9d0628 100755
---
a/streampark-console/streampark-console-service/src/main/assembly/bin/streampark.sh
+++
b/streampark-console/streampark-console-service/src/main/assembly/bin/streampark.sh
@@ -412,6 +412,7 @@ start() {
eval $NOHUP $_RUNJAVA $JAVA_OPTS \
-classpath "$APP_CLASSPATH" \
-Dapp.home="${APP_HOME}" \
+ -Dlogging.config="${APP_CONF}/logback.xml" \
-Djava.io.tmpdir="$APP_TMPDIR" \
$APP_MAIN >> "$APP_OUT" 2>&1 "&"
@@ -484,6 +485,7 @@ start_docker() {
$_RUNJAVA $JAVA_OPTS \
-classpath "$APP_CLASSPATH" \
-Dapp.home="${APP_HOME}" \
+ -Dlogging.config="${APP_CONF}/logback.xml" \
-Djava.io.tmpdir="$APP_TMPDIR" \
$APP_MAIN
diff --git
a/streampark-console/streampark-console-service/src/main/resources/logback-spring.xml
b/streampark-console/streampark-console-service/src/main/resources/logback.xml
similarity index 55%
rename from
streampark-console/streampark-console-service/src/main/resources/logback-spring.xml
rename to
streampark-console/streampark-console-service/src/main/resources/logback.xml
index 27334797a..c7daf7a0e 100644
---
a/streampark-console/streampark-console-service/src/main/resources/logback-spring.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/logback.xml
@@ -17,33 +17,38 @@
-->
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<contextName>StreamPark</contextName>
- <property name="log.path" value="${app.home}/logs"/>
- <property name="log.maxHistory" value="15"/>
- <property name="log.colorPattern"
+ <property name="LOG_HOME" value="${app.home}/logs"/>
+ <property name="LOG_MAX_HISTORY" value="15"/>
value="%d{yyyy-MM-dd HH:mm:ss} | %highlight(%-5level) |
%boldYellow(%thread) | %boldGreen(%logger):%L] %msg%n"/>
- <property name="log.pattern"
+ <property name="LOG_PATTERN"
value="%d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread]
%-5level %logger{36}:%L - %msg%n"/>
+ <property name="COLOR_PATTERN"
+ value="%d{yyyy-MM-dd HH:mm:ss} | %highlight(%-5level) |
%boldYellow(%thread) | %boldGreen(%logger):%L] %msg%n"/>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>${log.colorPattern}</pattern>
+ <pattern>${COLOR_PATTERN}</pattern>
+ <charset>UTF-8</charset>
</encoder>
</appender>
<appender name="INFO"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>INFO</level>
- <onMatch>ACCEPT</onMatch>
- <onMismatch>DENY</onMismatch>
+ <onMatch>DENY</onMatch>
+ <onMismatch>ACCEPT</onMismatch>
</filter>
+ <file>${LOG_HOME}/info.log</file>
+ <rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+
<fileNamePattern>${LOG_HOME}/info.%d{yyyy-MM-dd}_%i.log</fileNamePattern>
+ <maxHistory>${LOG_MAX_HISTORY}</maxHistory>
+ <maxFileSize>50MB</maxFileSize>
+ <totalSizeCap>1GB</totalSizeCap>
+ </rollingPolicy>
<encoder>
+ <pattern>${LOG_PATTERN}</pattern>
<charset>UTF-8</charset>
- <pattern>${log.pattern}</pattern>
</encoder>
- <rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-
<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
- <MaxHistory>${log.maxHistory}</MaxHistory>
- </rollingPolicy>
</appender>
<appender name="ERROR"
class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -52,12 +57,16 @@
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
- <rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-
<fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <file>${LOG_HOME}/error.log</file>
+ <rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+
<fileNamePattern>${LOG_HOME}/error.%d{yyyy-MM-dd}_%i.log</fileNamePattern>
+ <maxHistory>${LOG_MAX_HISTORY}</maxHistory>
+ <maxFileSize>50MB</maxFileSize>
+ <totalSizeCap>1GB</totalSizeCap>
</rollingPolicy>
<encoder>
+ <pattern>${LOG_PATTERN}</pattern>
<charset>UTF-8</charset>
- <pattern>${log.pattern}</pattern>
</encoder>
</appender>
@@ -67,12 +76,16 @@
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
- <rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-
<fileNamePattern>${log.path}/warn.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <file>${LOG_HOME}/warn.log</file>
+ <rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+
<fileNamePattern>${LOG_HOME}/warn.%d{yyyy-MM-dd}_%i.log</fileNamePattern>
+ <maxHistory>${LOG_MAX_HISTORY}</maxHistory>
+ <maxFileSize>50MB</maxFileSize>
+ <totalSizeCap>1GB</totalSizeCap>
</rollingPolicy>
<encoder>
+ <pattern>${LOG_PATTERN}</pattern>
<charset>UTF-8</charset>
- <pattern>${log.pattern}</pattern>
</encoder>
</appender>
@@ -82,12 +95,16 @@
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
- <rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-
<fileNamePattern>${log.path}/debug.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <file>${LOG_HOME}/debug.log</file>
+ <rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+
<fileNamePattern>${LOG_HOME}/debug.%d{yyyy-MM-dd}_%i.log</fileNamePattern>
+ <maxHistory>${LOG_MAX_HISTORY}</maxHistory>
+ <maxFileSize>50MB</maxFileSize>
+ <totalSizeCap>1GB</totalSizeCap>
</rollingPolicy>
<encoder>
+ <pattern>${LOG_PATTERN}</pattern>
<charset>UTF-8</charset>
- <pattern>${log.pattern}</pattern>
</encoder>
</appender>
@@ -97,15 +114,26 @@
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
- <rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-
<fileNamePattern>${log.path}/trace.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <file>${LOG_HOME}/trace.log</file>
+ <rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+
<fileNamePattern>${LOG_HOME}/trace.%d{yyyy-MM-dd}_%i.log</fileNamePattern>
+ <maxHistory>${LOG_MAX_HISTORY}</maxHistory>
+ <maxFileSize>50MB</maxFileSize>
+ <totalSizeCap>1GB</totalSizeCap>
</rollingPolicy>
<encoder>
+ <pattern>${LOG_PATTERN}</pattern>
<charset>UTF-8</charset>
- <pattern>${log.pattern}</pattern>
</encoder>
</appender>
+ <!-- log level -->
+ <logger name="org.springframework.web" level="INFO"/>
+ <logger name="com.apache.ibatis" level="TRACE"/>
+ <logger name="java.sql.Connection" level="DEBUG"/>
+ <logger name="java.sql.Statement" level="DEBUG"/>
+ <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+
<root level="INFO">
<appender-ref ref="STDOUT"/>
<appender-ref ref="INFO"/>
