Merge branch 'feat_logLevel_mergeDev' into 'v1.8.0_dev'

日志基本位置调整



See merge request !280

Author: dapeng

core/pom.xml

@@ -20,6 +20,7 @@
         <calcite.server.version>1.16.0</calcite.server.version>
         <jackson.version>2.7.9</jackson.version>
         <guava.version>19.0</guava.version>
+        <logger.tool.version>1.0.0-SNAPSHOT</logger.tool.version>
     </properties>
 
     <dependencies>
@@ -121,7 +122,11 @@
             <artifactId>junit</artifactId>
             <version>4.12</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.aiweiergou</groupId>
+            <artifactId>tools-logger</artifactId>
+            <version>${logger.tool.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

core/src/main/java/com/dtstack/flink/sql/Main.java

@@ -38,6 +38,7 @@ public class Main {
 
     public static void main(String[] args) throws Exception {
         ParamsInfo paramsInfo = ExecuteProcessHelper.parseParams(args);
+        ExecuteProcessHelper.setLogLevel(paramsInfo);
         StreamExecutionEnvironment env = ExecuteProcessHelper.getStreamExecution(paramsInfo);
         env.execute(paramsInfo.getName());
         LOG.info("program {} execution success", paramsInfo.getName());

core/src/main/java/com/dtstack/flink/sql/constrant/ConfigConstrant.java

@@ -65,7 +65,7 @@ public class ConfigConstrant {
 
     public static final String RESTOREENABLE = "restore.enable";
 
-        public static final String LOG_LEVEL_KEY = "logLevel";
+    public static final String LOG_LEVEL_KEY = "logLevel";
 
 
     // restart plocy
@@ -75,4 +75,5 @@ public class ConfigConstrant {
 
     public static final String  DELAYINTERVAL= "delay.interval"; //sec
 
+
 }

core/src/main/java/com/dtstack/flink/sql/exec/ExecuteProcessHelper.java

@@ -18,8 +18,10 @@
 
 package com.dtstack.flink.sql.exec;
 
+import com.aiweiergou.tool.logger.api.ChangeLogLevelProcess;
 import com.dtstack.flink.sql.classloader.ClassLoaderManager;
 import com.dtstack.flink.sql.config.CalciteConfig;
+import com.dtstack.flink.sql.constrant.ConfigConstrant;
 import com.dtstack.flink.sql.enums.ClusterMode;
 import com.dtstack.flink.sql.enums.ECacheType;
 import com.dtstack.flink.sql.enums.EPluginLoadMode;
@@ -353,5 +355,12 @@ public static StreamExecutionEnvironment getStreamExeEnv(Properties confProperti
         return env;
     }
 
-
+    public static void setLogLevel(ParamsInfo paramsInfo){
+        String logLevel = paramsInfo.getConfProp().getProperty(ConfigConstrant.LOG_LEVEL_KEY);
+        if(org.apache.commons.lang3.StringUtils.isBlank(logLevel)){
+            return;
+        }
+        ChangeLogLevelProcess logLevelProcess = new ChangeLogLevelProcess();
+        logLevelProcess.process(logLevel);
+    }
 }

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>

launcher/src/main/java/com/dtstack/flink/sql/launcher/LauncherMain.java

@@ -149,12 +149,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);
-    }
 }

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>