Merge branch 'feat_logLevel_mergeTest' into '1.8_test_3.10.x'

Feat log level merge test



See merge request !269

Author: dapeng

README.md

@@ -181,6 +181,11 @@ sh submit.sh -sql D:\sideSql.txt  -name xctest -remoteSqlPluginPath /opt/dtstack
 	* 描述：yarn session 模式下指定的运行的一些参数，[可参考](https://ci.apache.org/projects/flink/flink-docs-release-1.8/ops/cli.html),目前只支持指定yid
 	* 必选：否
 	* 默认值：false	
+	
+* **logLevel**
+    	* 描述：设定日志级别
+    	* 必选：否
+    	* 默认值：info	
 
 ## 2 结构
 ### 2.1 源表插件

core/src/main/java/com/dtstack/flink/sql/option/Options.java

@@ -68,6 +68,9 @@ public class Options {
 
     @OptionRequired(description = "plugin load mode, by classpath or shipfile")
     private String pluginLoadMode = EPluginLoadMode.CLASSPATH.name();
+    
+    @OptionRequired(description = "log level")
+    private String logLevel = "info";
 
     public String getMode() {
         return mode;
@@ -173,4 +176,11 @@ public void setPluginLoadMode(String pluginLoadMode) {
         this.pluginLoadMode = pluginLoadMode;
     }
 
+	public String getLogLevel() {
+		return logLevel;
+	}
+
+	public void setLogLevel(String logLevel) {
+		this.logLevel = logLevel;
+	}
 }

launcher/pom.xml

@@ -10,7 +10,6 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>sql.launcher</artifactId>
-
     <dependencies>
         <dependency>
             <groupId>com.dtstack.flink</groupId>
@@ -35,7 +34,11 @@
             <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

@@ -20,6 +20,7 @@
 
 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;
@@ -83,6 +84,8 @@ public static void main(String[] args) throws Exception {
         confProp = URLDecoder.decode(confProp, Charsets.UTF_8.toString());
         Properties confProperties = PluginUtil.jsonStrToObject(confProp, Properties.class);
 
+        setLogLevel(launcherOptions.getLogLevel());
+
         if(mode.equals(ClusterMode.local.name())) {
             String[] localArgs = argList.toArray(new String[argList.size()]);
             Main.main(localArgs);
@@ -146,4 +149,12 @@ 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,6 +41,7 @@
   <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>