This is an automated email from the ASF dual-hosted git repository.
wenjun pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 6d29b1c06c [Improvement-16641] Add thread name in logback (#16640)
6d29b1c06c is described below
commit 6d29b1c06c9930b37872ac496fb61f8ab5e93e73
Author: Wenjun Ruan <[email protected]>
AuthorDate: Sat Sep 21 14:37:43 2024 +0800
[Improvement-16641] Add thread name in logback (#16640)
---
.../src/main/resources/logback-spring.xml | 2 +-
dolphinscheduler-api/src/main/resources/logback-spring.xml | 4 ++--
dolphinscheduler-master/src/main/resources/logback-spring.xml | 6 +++---
dolphinscheduler-master/src/test/resources/logback.xml | 2 +-
.../src/main/resources/logback-spring.xml | 6 +++---
dolphinscheduler-worker/src/main/resources/logback-spring.xml | 6 +++---
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git
a/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/resources/logback-spring.xml
b/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/resources/logback-spring.xml
index 81c8042bc5..ea4a728f3a 100644
---
a/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/resources/logback-spring.xml
+++
b/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>
- [%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z} %logger{96}:[%line]
- %msg%n
+ %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread]
%logger{10}:[%line] - %msg%n
</pattern>
<charset>UTF-8</charset>
</encoder>
diff --git a/dolphinscheduler-api/src/main/resources/logback-spring.xml
b/dolphinscheduler-api/src/main/resources/logback-spring.xml
index 1982d6de5b..1a9cc3f25c 100644
--- a/dolphinscheduler-api/src/main/resources/logback-spring.xml
+++ b/dolphinscheduler-api/src/main/resources/logback-spring.xml
@@ -23,7 +23,7 @@
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>
- [%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z} %logger{10}:[%line]
- %msg%n
+ %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread]
%logger{10}:[%line] - %msg%n
</pattern>
<charset>UTF-8</charset>
</encoder>
@@ -40,7 +40,7 @@
</rollingPolicy>
<encoder>
<pattern>
- [%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z} %logger{10}:[%line]
- %msg%n
+ %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread]
%logger{10}:[%line] - %msg%n
</pattern>
<charset>UTF-8</charset>
</encoder>
diff --git a/dolphinscheduler-master/src/main/resources/logback-spring.xml
b/dolphinscheduler-master/src/main/resources/logback-spring.xml
index efc5a513c6..5ce1423d0d 100644
--- a/dolphinscheduler-master/src/main/resources/logback-spring.xml
+++ b/dolphinscheduler-master/src/main/resources/logback-spring.xml
@@ -23,7 +23,7 @@
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>
- [WI-%X{workflowInstanceId:-0}][TI-%X{taskInstanceId:-0}] -
[%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z} %logger{10}:[%line] - %msg%n
+ [WI-%X{workflowInstanceId:-0}][TI-%X{taskInstanceId:-0}] -
%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %logger{10}:[%line] - %msg%n
</pattern>
<charset>UTF-8</charset>
</encoder>
@@ -42,7 +42,7 @@
<file>${taskInstanceLogFullPath}</file>
<encoder>
<pattern>
- [%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z} - %message%n
+ %date{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] -
%message%n
</pattern>
<charset>UTF-8</charset>
</encoder>
@@ -61,7 +61,7 @@
</rollingPolicy>
<encoder>
<pattern>
- [WI-%X{workflowInstanceId:-0}][TI-%X{taskInstanceId:-0}] -
[%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z} %logger{10}:[%line] - %msg%n
+ [WI-%X{workflowInstanceId:-0}][TI-%X{taskInstanceId:-0}] -
%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %logger{10}:[%line] - %msg%n
</pattern>
<charset>UTF-8</charset>
</encoder>
diff --git a/dolphinscheduler-master/src/test/resources/logback.xml
b/dolphinscheduler-master/src/test/resources/logback.xml
index 13893b27fd..d759cd262d 100644
--- a/dolphinscheduler-master/src/test/resources/logback.xml
+++ b/dolphinscheduler-master/src/test/resources/logback.xml
@@ -23,7 +23,7 @@
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>
- [WI-%X{workflowInstanceId:-0}][TI-%X{taskInstanceId:-0}] -
[%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z} %logger{10}:[%line] - %msg%n
+ [WI-%X{workflowInstanceId:-0}][TI-%X{taskInstanceId:-0}] -
%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %logger{10}:[%line] - %msg%n
</pattern>
<charset>UTF-8</charset>
</encoder>
diff --git
a/dolphinscheduler-standalone-server/src/main/resources/logback-spring.xml
b/dolphinscheduler-standalone-server/src/main/resources/logback-spring.xml
index daf3c77f3c..0ad9c6d0ca 100644
--- a/dolphinscheduler-standalone-server/src/main/resources/logback-spring.xml
+++ b/dolphinscheduler-standalone-server/src/main/resources/logback-spring.xml
@@ -23,7 +23,7 @@
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>
- [WI-%X{workflowInstanceId:-0}][TI-%X{taskInstanceId:-0}] -
[%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z} %logger{10}:[%line] - %msg%n
+ [WI-%X{workflowInstanceId:-0}][TI-%X{taskInstanceId:-0}] -
%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %logger{10}:[%line] - %msg%n
</pattern>
<charset>UTF-8</charset>
</encoder>
@@ -38,7 +38,7 @@
</rollingPolicy>
<encoder>
<pattern>
- [%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z} %logger{10}:[%line]
- %msg%n
+ [WI-%X{workflowInstanceId:-0}][TI-%X{taskInstanceId:-0}] -
%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %logger{10}:[%line] - %msg%n
</pattern>
<charset>UTF-8</charset>
</encoder>
@@ -61,7 +61,7 @@
<file>${taskInstanceLogFullPath}</file>
<encoder>
<pattern>
- [%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z} - %message%n
+ %date{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] -
%message%n
</pattern>
<charset>UTF-8</charset>
</encoder>
diff --git a/dolphinscheduler-worker/src/main/resources/logback-spring.xml
b/dolphinscheduler-worker/src/main/resources/logback-spring.xml
index b272315f2f..1bfbdd506d 100644
--- a/dolphinscheduler-worker/src/main/resources/logback-spring.xml
+++ b/dolphinscheduler-worker/src/main/resources/logback-spring.xml
@@ -23,7 +23,7 @@
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>
- [WI-%X{workflowInstanceId:-0}][TI-%X{taskInstanceId:-0}] -
[%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z} %logger{10}:[%line] - %msg%n
+ [WI-%X{workflowInstanceId:-0}][TI-%X{taskInstanceId:-0}] -
%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %logger{10}:[%line] - %msg%n
</pattern>
<charset>UTF-8</charset>
</encoder>
@@ -42,7 +42,7 @@
<file>${taskInstanceLogFullPath}</file>
<encoder>
<pattern>
- [%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z} - %message%n
+ %date{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] -
%message%n
</pattern>
<charset>UTF-8</charset>
</encoder>
@@ -61,7 +61,7 @@
</rollingPolicy>
<encoder>
<pattern>
- [WI-%X{workflowInstanceId:-0}][TI-%X{taskInstanceId:-0}] -
[%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z} %logger{10}:[%line] - %msg%n
+ [WI-%X{workflowInstanceId:-0}][TI-%X{taskInstanceId:-0}] -
%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %logger{10}:[%line] - %msg%n
</pattern>
<charset>UTF-8</charset>
</encoder>
