Skip to content

Commit 738a565

Browse files
author
gituser
committed
Merge branch 'hotfix_1.8_3.10.x_23710' into 1.8_release_3.10.x
2 parents 0462e66 + e433093 commit 738a565

File tree

3 files changed

+0
-17
lines changed

3 files changed

+0
-17
lines changed

launcher/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@
3434
<artifactId>fastjson</artifactId>
3535
<version>1.2.7</version>
3636
</dependency>
37-
<dependency>
38-
<groupId>com.aiweiergou</groupId>
39-
<artifactId>tools-logger</artifactId>
40-
<version>${logger.tool.version}</version>
41-
</dependency>
4237
</dependencies>
4338

4439
<build>

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

-11
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
package com.dtstack.flink.sql.launcher;
2222

23-
import com.aiweiergou.tool.logger.api.ChangeLogLevelProcess;
2423
import com.dtstack.flink.sql.constrant.ConfigConstrant;
2524
import com.google.common.collect.Lists;
2625
import com.alibaba.fastjson.JSON;
@@ -84,8 +83,6 @@ public static void main(String[] args) throws Exception {
8483
confProp = URLDecoder.decode(confProp, Charsets.UTF_8.toString());
8584
Properties confProperties = PluginUtil.jsonStrToObject(confProp, Properties.class);
8685

87-
setLogLevel(confProperties.getProperty(ConfigConstrant.LOG_LEVEL_KEY));
88-
8986
if(mode.equals(ClusterMode.local.name())) {
9087
String[] localArgs = argList.toArray(new String[argList.size()]);
9188
Main.main(localArgs);
@@ -149,12 +146,4 @@ private static String[] parseJson(String[] args) {
149146
String[] array = list.toArray(new String[list.size()]);
150147
return array;
151148
}
152-
153-
private static void setLogLevel(String logLevel){
154-
if(org.apache.commons.lang3.StringUtils.isBlank(logLevel)){
155-
return;
156-
}
157-
ChangeLogLevelProcess logLevelProcess = new ChangeLogLevelProcess();
158-
logLevelProcess.process(logLevel);
159-
}
160149
}

pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
<properties>
4242
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4343
<flink.version>1.8.1</flink.version>
44-
<logger.tool.version>1.0.0-SNAPSHOT</logger.tool.version>
4544
</properties>
4645

4746
<build>

0 commit comments

Comments
 (0)