This is an automated email from the ASF dual-hosted git repository.
zihaoxiang 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 1285cb4832 [Chore] Fix SensitiveDataConverter cannot work (#17006)
1285cb4832 is described below
commit 1285cb4832992b05c3f6c341021acfcfe66b25d9
Author: Wenjun Ruan <[email protected]>
AuthorDate: Tue Feb 11 16:19:28 2025 +0800
[Chore] Fix SensitiveDataConverter cannot work (#17006)
---
dolphinscheduler-master/src/main/resources/logback-spring.xml | 9 +++++----
dolphinscheduler-master/src/test/resources/logback.xml | 9 +++++----
.../src/main/resources/logback-spring.xml | 9 +++++----
dolphinscheduler-worker/src/main/resources/logback-spring.xml | 9 +++++----
dolphinscheduler-worker/src/test/resources/logback.xml | 11 +++++------
5 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/dolphinscheduler-master/src/main/resources/logback-spring.xml
b/dolphinscheduler-master/src/main/resources/logback-spring.xml
index e366eec71d..a4c3a4f22d 100644
--- a/dolphinscheduler-master/src/main/resources/logback-spring.xml
+++ b/dolphinscheduler-master/src/main/resources/logback-spring.xml
@@ -20,17 +20,18 @@
<property name="log.base" value="logs"/>
<property scope="context" name="log.base.ctx" value="${log.base}" />
+ <conversionRule conversionWord="message"
+
converterClass="org.apache.dolphinscheduler.plugin.task.api.log.SensitiveDataConverter"/>
+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>
- [WI-%X{workflowInstanceId:-0}][TI-%X{taskInstanceId:-0}] -
%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %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] - %message%n
</pattern>
<charset>UTF-8</charset>
</encoder>
</appender>
- <conversionRule conversionWord="message"
-
converterClass="org.apache.dolphinscheduler.plugin.task.api.log.SensitiveDataConverter"/>
<appender name="TASKLOGFILE"
class="ch.qos.logback.classic.sift.SiftingAppender">
<filter
class="org.apache.dolphinscheduler.plugin.task.api.log.TaskLogFilter"/>
<Discriminator
class="org.apache.dolphinscheduler.plugin.task.api.log.TaskLogDiscriminator">
@@ -61,7 +62,7 @@
</rollingPolicy>
<encoder>
<pattern>
- [WI-%X{workflowInstanceId:-0}][TI-%X{taskInstanceId:-0}] -
%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %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] - %message%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 18d1350c24..044efca708 100644
--- a/dolphinscheduler-master/src/test/resources/logback.xml
+++ b/dolphinscheduler-master/src/test/resources/logback.xml
@@ -20,17 +20,18 @@
<property name="log.base" value="logs"/>
<property scope="context" name="log.base.ctx" value="${log.base}" />
+ <conversionRule conversionWord="message"
+
converterClass="org.apache.dolphinscheduler.plugin.task.api.log.SensitiveDataConverter"/>
+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>
- [WI-%X{workflowInstanceId:-0}][TI-%X{taskInstanceId:-0}] -
%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %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] - %message%n
</pattern>
<charset>UTF-8</charset>
</encoder>
</appender>
- <conversionRule conversionWord="message"
-
converterClass="org.apache.dolphinscheduler.plugin.task.api.log.SensitiveDataConverter"/>
<appender name="TASKLOGFILE"
class="ch.qos.logback.classic.sift.SiftingAppender">
<filter
class="org.apache.dolphinscheduler.plugin.task.api.log.TaskLogFilter"/>
<Discriminator
class="org.apache.dolphinscheduler.plugin.task.api.log.TaskLogDiscriminator">
@@ -61,7 +62,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}] -
[%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z} %logger{10}:[%line] - %message%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 6734f7c6fa..d219cc6822 100644
--- a/dolphinscheduler-standalone-server/src/main/resources/logback-spring.xml
+++ b/dolphinscheduler-standalone-server/src/main/resources/logback-spring.xml
@@ -20,10 +20,13 @@
<property name="log.base" value="logs"/>
<property scope="context" name="log.base.ctx" value="${log.base}" />
+ <conversionRule conversionWord="message"
+
converterClass="org.apache.dolphinscheduler.plugin.task.api.log.SensitiveDataConverter"/>
+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>
- [WI-%X{workflowInstanceId:-0}][TI-%X{taskInstanceId:-0}] -
%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %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] - %message%n
</pattern>
<charset>UTF-8</charset>
</encoder>
@@ -40,7 +43,7 @@
</rollingPolicy>
<encoder>
<pattern>
- [WI-%X{workflowInstanceId:-0}][TI-%X{taskInstanceId:-0}] -
%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %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] - %message%n
</pattern>
<charset>UTF-8</charset>
</encoder>
@@ -50,8 +53,6 @@
<logger name="org.apache.hbase" level="WARN"/>
<logger name="org.apache.hadoop" level="WARN"/>
- <conversionRule conversionWord="message"
-
converterClass="org.apache.dolphinscheduler.plugin.task.api.log.SensitiveDataConverter"/>
<appender name="TASKLOGFILE"
class="ch.qos.logback.classic.sift.SiftingAppender">
<filter
class="org.apache.dolphinscheduler.plugin.task.api.log.TaskLogFilter"/>
<Discriminator
class="org.apache.dolphinscheduler.plugin.task.api.log.TaskLogDiscriminator">
diff --git a/dolphinscheduler-worker/src/main/resources/logback-spring.xml
b/dolphinscheduler-worker/src/main/resources/logback-spring.xml
index 01b35c2300..fe99943fad 100644
--- a/dolphinscheduler-worker/src/main/resources/logback-spring.xml
+++ b/dolphinscheduler-worker/src/main/resources/logback-spring.xml
@@ -20,17 +20,18 @@
<property name="log.base" value="logs"/>
<property scope="context" name="log.base.ctx" value="${log.base}" />
+ <conversionRule conversionWord="message"
+
converterClass="org.apache.dolphinscheduler.plugin.task.api.log.SensitiveDataConverter"/>
+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>
- [WI-%X{workflowInstanceId:-0}][TI-%X{taskInstanceId:-0}] -
%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %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] - %message%n
</pattern>
<charset>UTF-8</charset>
</encoder>
</appender>
- <conversionRule conversionWord="message"
-
converterClass="org.apache.dolphinscheduler.plugin.task.api.log.SensitiveDataConverter"/>
<appender name="TASKLOGFILE"
class="ch.qos.logback.classic.sift.SiftingAppender">
<filter
class="org.apache.dolphinscheduler.plugin.task.api.log.TaskLogFilter"/>
<Discriminator
class="org.apache.dolphinscheduler.plugin.task.api.log.TaskLogDiscriminator">
@@ -61,7 +62,7 @@
</rollingPolicy>
<encoder>
<pattern>
- [WI-%X{workflowInstanceId:-0}][TI-%X{taskInstanceId:-0}] -
%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %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] - %message%n
</pattern>
<charset>UTF-8</charset>
</encoder>
diff --git a/dolphinscheduler-worker/src/test/resources/logback.xml
b/dolphinscheduler-worker/src/test/resources/logback.xml
index c4cbf15468..916d79e354 100644
--- a/dolphinscheduler-worker/src/test/resources/logback.xml
+++ b/dolphinscheduler-worker/src/test/resources/logback.xml
@@ -19,18 +19,18 @@
<configuration scan="true" scanPeriod="120 seconds">
<property name="log.base" value="logs"/>
+ <conversionRule conversionWord="message"
+
converterClass="org.apache.dolphinscheduler.plugin.task.api.log.SensitiveDataConverter"/>
+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>
- [%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z} %logger{96}:[%line] -
-
[WorkflowInstance-%X{workflowInstanceId:-0}][TaskInstance-%X{taskInstanceId:-0}]
- %msg%n
+ [%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z} %logger{96}:[%line]
-
[WorkflowInstance-%X{workflowInstanceId:-0}][TaskInstance-%X{taskInstanceId:-0}]
- %message%n
</pattern>
<charset>UTF-8</charset>
</encoder>
</appender>
- <conversionRule conversionWord="message"
-
converterClass="org.apache.dolphinscheduler.plugin.task.api.log.SensitiveDataConverter"/>
<appender name="TASKLOGFILE"
class="ch.qos.logback.classic.sift.SiftingAppender">
<filter
class="org.apache.dolphinscheduler.plugin.task.api.log.TaskLogFilter"/>
<Discriminator
class="org.apache.dolphinscheduler.plugin.task.api.log.TaskLogDiscriminator">
@@ -61,8 +61,7 @@
</rollingPolicy>
<encoder>
<pattern>
- [%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z} %logger{96}:[%line] -
-
[WorkflowInstance-%X{workflowInstanceId:-0}][TaskInstance-%X{taskInstanceId:-0}]
- %msg%n
+ [%level] %date{yyyy-MM-dd HH:mm:ss.SSS Z} %logger{96}:[%line]
-
[WorkflowInstance-%X{workflowInstanceId:-0}][TaskInstance-%X{taskInstanceId:-0}]
- %message%n
</pattern>
<charset>UTF-8</charset>
</encoder>
