From 2ef65c53ee053ec88c8a4b6fd988d4a77da113ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B9=94=E5=8D=A0=E5=8D=AB?= <825193156@qq.com>
Date: Fri, 2 Aug 2019 15:50:09 +0800
Subject: [PATCH] logger log filter modify path not contains dot (#666)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Filtering the log of one task to the log of another task

* Filtering the log of one task to the log of another task update

* rollback

* The log shows confusion

* update loggerserver

* update

* datasource connect error modify

* rollback code，logger server log filter ，process variables modify local variables

* Client ip changes, sessionId cannot be accessed modify

* mr and spark task tenant queue set error modify

* tenant queryById modify

* update

* update

* update

* update

* TaskSchedulerThread TaskProps setTenantCode

* logger filter modify

* logger log filter modify path not contains dot
---
 .../src/main/java/cn/escheduler/server/rpc/LoggerServer.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/escheduler-server/src/main/java/cn/escheduler/server/rpc/LoggerServer.java b/escheduler-server/src/main/java/cn/escheduler/server/rpc/LoggerServer.java
index 4e12ced00..dc56119c8 100644
--- a/escheduler-server/src/main/java/cn/escheduler/server/rpc/LoggerServer.java
+++ b/escheduler-server/src/main/java/cn/escheduler/server/rpc/LoggerServer.java
@@ -196,7 +196,7 @@ public class LoggerServer {
                     errorLineFlag = filterLine(path,line);
                 }
 
-                if (!errorLineFlag || !line.startsWith("TaskLogger")){
+                if (!errorLineFlag || !line.contains("TaskLogger")){
                     sb.append(line + "\r\n");
                 }
             }
@@ -224,7 +224,7 @@ public class LoggerServer {
      * @return
      */
     private static boolean filterLine(String path,String line){
-        String removeSuffix = path.split("\\.")[0];
+        String removeSuffix = path.substring(0, path.length() - 4);
         String[] strArrs = removeSuffix.split("/");
         String taskAppId = String.format("%s_%s_%s",
                 strArrs[strArrs.length - 3],
-- 
GitLab