[incubator-dolphinscheduler] branch 1.3.5-prepare updated: [1.3.5-prepare][cherry-pick][Fix-#4567]worker-server logback partial … (#4665)

[leonbao]

This is an automated email from the ASF dual-hosted git repository.

leonbao pushed a commit to branch 1.3.5-prepare
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/1.3.5-prepare by this push:
     new 50c268f  [1.3.5-prepare][cherry-pick][Fix-#4567]worker-server logback 
partial … (#4665)
50c268f is described below

commit 50c268fa8be3570ee15798ecc0c9da3651b8ef14
Author: Kirs <acm_mas...@163.com>
AuthorDate: Wed Feb 3 11:19:41 2021 +0800

    [1.3.5-prepare][cherry-pick][Fix-#4567]worker-server logback partial … 
(#4665)
    
    * [1.3.5-prepare][cherry-pick][Fix-#4567]worker-server logback partial logs 
are not printed
    
    See #4566、#4567
    
    * [1.3.5-prepare][cherry-pick][Fix-#4567]worker-server logback partial logs 
are not printed
    
    See #4566、#4567
    
    * [1.3.5-prepare][cherry-pick][Fix-#4567]worker-server logback partial logs 
are not printed
    
    See #4566、#4567
---
 dolphinscheduler-server/src/main/resources/logback-master.xml | 4 ++--
 dolphinscheduler-server/src/main/resources/logback-worker.xml | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dolphinscheduler-server/src/main/resources/logback-master.xml 
b/dolphinscheduler-server/src/main/resources/logback-master.xml
index 2b986dd..a61d891 100644
--- a/dolphinscheduler-server/src/main/resources/logback-master.xml
+++ b/dolphinscheduler-server/src/main/resources/logback-master.xml
@@ -32,9 +32,9 @@
     <conversionRule conversionWord="messsage"
                     
converterClass="org.apache.dolphinscheduler.server.log.SensitiveDataConverter"/>
     <appender name="TASKLOGFILE" 
class="ch.qos.logback.classic.sift.SiftingAppender">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+        <!-- <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
             <level>INFO</level>
-        </filter>
+        </filter> -->
         <filter class="org.apache.dolphinscheduler.server.log.TaskLogFilter"/>
         <Discriminator 
class="org.apache.dolphinscheduler.server.log.TaskLogDiscriminator">
             <key>taskAppId</key>
diff --git a/dolphinscheduler-server/src/main/resources/logback-worker.xml 
b/dolphinscheduler-server/src/main/resources/logback-worker.xml
index f96bef9..bea68ff 100644
--- a/dolphinscheduler-server/src/main/resources/logback-worker.xml
+++ b/dolphinscheduler-server/src/main/resources/logback-worker.xml
@@ -33,9 +33,9 @@
     <conversionRule conversionWord="messsage"
                     
converterClass="org.apache.dolphinscheduler.server.log.SensitiveDataConverter"/>
     <appender name="TASKLOGFILE" 
class="ch.qos.logback.classic.sift.SiftingAppender">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+        <!-- <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
             <level>INFO</level>
-        </filter>
+        </filter> -->
         <filter class="org.apache.dolphinscheduler.server.log.TaskLogFilter"/>
         <Discriminator 
class="org.apache.dolphinscheduler.server.log.TaskLogDiscriminator">
             <key>taskAppId</key>
@@ -56,10 +56,9 @@
     </appender>
     <appender name="WORKERLOGFILE" 
class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${log.base}/dolphinscheduler-worker.log</file>
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+        <!-- <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
             <level>INFO</level>
-        </filter>
-        <filter 
class="org.apache.dolphinscheduler.server.log.WorkerLogFilter"/>
+        </filter> -->
         <rollingPolicy 
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             
<fileNamePattern>${log.base}/dolphinscheduler-worker.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
             <maxHistory>168</maxHistory>