Merge branch 'hotfix_1.8_3.10.x_23710' into 1.8_release_3.10.x

gmmstrive · Mar 25, 2020 · 738a565 · 738a565
2 parents 0462e66 + e433093
commit 738a565
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 17 deletions.
diff --git a/launcher/pom.xml b/launcher/pom.xml
@@ -34,11 +34,6 @@
             <artifactId>fastjson</artifactId>
             <version>1.2.7</version>
         </dependency>
-        <dependency>
-            <groupId>com.aiweiergou</groupId>
-            <artifactId>tools-logger</artifactId>
-            <version>${logger.tool.version}</version>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/launcher/src/main/java/com/dtstack/flink/sql/launcher/LauncherMain.java b/launcher/src/main/java/com/dtstack/flink/sql/launcher/LauncherMain.java
@@ -20,7 +20,6 @@
 
 package com.dtstack.flink.sql.launcher;
 
-import com.aiweiergou.tool.logger.api.ChangeLogLevelProcess;
 import com.dtstack.flink.sql.constrant.ConfigConstrant;
 import com.google.common.collect.Lists;
 import com.alibaba.fastjson.JSON;
@@ -84,8 +83,6 @@ public static void main(String[] args) throws Exception {
         confProp = URLDecoder.decode(confProp, Charsets.UTF_8.toString());
         Properties confProperties = PluginUtil.jsonStrToObject(confProp, Properties.class);
 
-        setLogLevel(confProperties.getProperty(ConfigConstrant.LOG_LEVEL_KEY));
-
         if(mode.equals(ClusterMode.local.name())) {
             String[] localArgs = argList.toArray(new String[argList.size()]);
             Main.main(localArgs);
@@ -149,12 +146,4 @@ private static String[] parseJson(String[] args) {
         String[] array = list.toArray(new String[list.size()]);
         return array;
     }
-
-    private static void setLogLevel(String logLevel){
-        if(org.apache.commons.lang3.StringUtils.isBlank(logLevel)){
-            return;
-        }
-        ChangeLogLevelProcess logLevelProcess = new ChangeLogLevelProcess();
-        logLevelProcess.process(logLevel);
-    }
 }
diff --git a/pom.xml b/pom.xml
@@ -41,7 +41,6 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <flink.version>1.8.1</flink.version>
-    <logger.tool.version>1.0.0-SNAPSHOT</logger.tool.version>
   </properties>
 
     <build>