Skip to content

Commit 228c935

Browse files
author
dapeng
committed
日志基本位置调整
1 parent 3c6532f commit 228c935

File tree

7 files changed

+19
-17
lines changed

7 files changed

+19
-17
lines changed

core/pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<calcite.server.version>1.16.0</calcite.server.version>
2121
<jackson.version>2.7.9</jackson.version>
2222
<guava.version>19.0</guava.version>
23+
<logger.tool.version>1.0.0-SNAPSHOT</logger.tool.version>
2324
</properties>
2425

2526
<dependencies>
@@ -121,7 +122,11 @@
121122
<artifactId>junit</artifactId>
122123
<version>4.12</version>
123124
</dependency>
124-
125+
<dependency>
126+
<groupId>com.aiweiergou</groupId>
127+
<artifactId>tools-logger</artifactId>
128+
<version>${logger.tool.version}</version>
129+
</dependency>
125130
</dependencies>
126131

127132
<build>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public class Main {
3838

3939
public static void main(String[] args) throws Exception {
4040
ParamsInfo paramsInfo = ExecuteProcessHelper.parseParams(args);
41+
ExecuteProcessHelper.setLogLevel(paramsInfo);
4142
StreamExecutionEnvironment env = ExecuteProcessHelper.getStreamExecution(paramsInfo);
4243
env.execute(paramsInfo.getName());
4344
LOG.info("program {} execution success", paramsInfo.getName());

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public class ConfigConstrant {
6565

6666
public static final String RESTOREENABLE = "restore.enable";
6767

68-
public static final String LOG_LEVEL_KEY = "logLevel";
68+
public static final String LOG_LEVEL_KEY = "logLevel";
6969

7070

7171
// restart plocy
@@ -75,4 +75,5 @@ public class ConfigConstrant {
7575

7676
public static final String DELAYINTERVAL= "delay.interval"; //sec
7777

78+
7879
}

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@
1818

1919
package com.dtstack.flink.sql.exec;
2020

21+
import com.aiweiergou.tool.logger.api.ChangeLogLevelProcess;
2122
import com.dtstack.flink.sql.classloader.ClassLoaderManager;
2223
import com.dtstack.flink.sql.config.CalciteConfig;
24+
import com.dtstack.flink.sql.constrant.ConfigConstrant;
2325
import com.dtstack.flink.sql.enums.ClusterMode;
2426
import com.dtstack.flink.sql.enums.ECacheType;
2527
import com.dtstack.flink.sql.enums.EPluginLoadMode;
@@ -353,5 +355,12 @@ public static StreamExecutionEnvironment getStreamExeEnv(Properties confProperti
353355
return env;
354356
}
355357

356-
358+
public static void setLogLevel(ParamsInfo paramsInfo){
359+
String logLevel = paramsInfo.getConfProp().getProperty(ConfigConstrant.LOG_LEVEL_KEY);
360+
if(org.apache.commons.lang3.StringUtils.isBlank(logLevel)){
361+
return;
362+
}
363+
ChangeLogLevelProcess logLevelProcess = new ChangeLogLevelProcess();
364+
logLevelProcess.process(logLevel);
365+
}
357366
}

launcher/pom.xml

Lines changed: 0 additions & 5 deletions
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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,4 @@ private static String[] parseJson(String[] args) {
149149
String[] array = list.toArray(new String[list.size()]);
150150
return array;
151151
}
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-
}
160152
}

pom.xml

Lines changed: 0 additions & 1 deletion
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)