Skip to content

Commit fbe541b

Browse files
committed
[feat][launcher] 默认绑定log4j并添加配置文件
1 parent d857e92 commit fbe541b

File tree

3 files changed

+55
-15
lines changed

3 files changed

+55
-15
lines changed

flinkx-launcher/src/main/java/com/dtstack/flinkx/launcher/Launcher.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ public class Launcher {
6767
public static final String MAIN_CLASS = "com.dtstack.flinkx.Main";
6868

6969
public static void main(String[] args) throws Exception {
70-
setLogLevel(Level.DEBUG.toString());
7170
OptionParser optionParser = new OptionParser(args);
7271
Options launcherOptions = optionParser.getOptions();
7372
findDefaultConfigDir(launcherOptions);
@@ -267,11 +266,4 @@ private static String readJob(String job) {
267266
throw new RuntimeException(e);
268267
}
269268
}
270-
271-
private static void setLogLevel(String level) {
272-
LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
273-
//设置全局日志级别
274-
ch.qos.logback.classic.Logger logger = loggerContext.getLogger("root");
275-
logger.setLevel(Level.toLevel(level));
276-
}
277269
}

flinkx-launcher/src/main/java/com/dtstack/flinkx/launcher/perJob/PerJobClusterClientBuilder.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ public YarnClusterDescriptor createPerJobClusterDescriptor(Options launcherOptio
9898
} else {
9999
throw new IllegalArgumentException("The Flink jar path is null");
100100
}
101-
File logback = new File(launcherOptions.getFlinkconf()+ File.separator + FlinkYarnSessionCli.CONFIG_FILE_LOGBACK_NAME);
102-
if(logback.exists()){
103-
flinkConfig.setString(YarnConfigOptionsInternal.APPLICATION_LOG_CONFIG_FILE, launcherOptions.getFlinkconf()+ File.separator + FlinkYarnSessionCli.CONFIG_FILE_LOGBACK_NAME);
104-
}else{
105-
File log4j = new File(launcherOptions.getFlinkconf()+ File.separator + FlinkYarnSessionCli.CONFIG_FILE_LOG4J_NAME);
106-
if(log4j.exists()){
107-
flinkConfig.setString(YarnConfigOptionsInternal.APPLICATION_LOG_CONFIG_FILE, launcherOptions.getFlinkconf()+ File.separator + FlinkYarnSessionCli.CONFIG_FILE_LOG4J_NAME);
101+
File log4j = new File(launcherOptions.getFlinkconf()+ File.separator + FlinkYarnSessionCli.CONFIG_FILE_LOG4J_NAME);
102+
if(log4j.exists()){
103+
flinkConfig.setString(YarnConfigOptionsInternal.APPLICATION_LOG_CONFIG_FILE, launcherOptions.getFlinkconf()+ File.separator + FlinkYarnSessionCli.CONFIG_FILE_LOG4J_NAME);
104+
}else {
105+
File logback = new File(launcherOptions.getFlinkconf() + File.separator + FlinkYarnSessionCli.CONFIG_FILE_LOGBACK_NAME);
106+
if (logback.exists()) {
107+
flinkConfig.setString(YarnConfigOptionsInternal.APPLICATION_LOG_CONFIG_FILE, launcherOptions.getFlinkconf() + File.separator + FlinkYarnSessionCli.CONFIG_FILE_LOGBACK_NAME);
108108
}
109109

110110
}
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
#############
2+
# 输出到控制台
3+
#############
4+
5+
# log4j.rootLogger日志输出类别和级别:只输出不低于该级别的日志信息 DEBUG < INFO < WARN < ERROR < FATAL
6+
# WARN:日志级别 CONSOLE:输出位置自己定义的一个名字 logfile:输出位置自己定义的一个名字
7+
log4j.rootLogger=INFO,CONSOLE,logfile
8+
# 配置CONSOLE输出到控制台
9+
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
10+
# 配置CONSOLE设置为自定义布局模式
11+
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
12+
# 配置CONSOLE日志的输出格式 2019-08-22 22:52:12,000 %r耗费毫秒数 %p日志的优先级 %t线程名 %C所属类名通常为全类名 %L代码中的行号 %x线程相关联的NDC %m日志 %n换行
13+
log4j.appender.CONSOLE.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} - %-4r %-5p [%t] %C:%m%n
14+
15+
################
16+
# 输出到日志文件中
17+
################
18+
19+
## 配置logfile输出到文件中 文件大小到达指定尺寸的时候产生新的日志文件
20+
#log4j.appender.logfile=org.apache.log4j.RollingFileAppender
21+
## 保存编码格式
22+
#log4j.appender.logfile.Encoding=UTF-8
23+
## 输出文件位置此为项目根目录下的logs文件夹中
24+
#log4j.appender.logfile.File=logs/root.log
25+
## 后缀可以是KB,MB,GB达到该大小后创建新的日志文件
26+
#log4j.appender.logfile.MaxFileSize=10MB
27+
## 设置滚定文件的最大值3 指可以产生root.log.1、root.log.2、root.log.3和root.log四个日志文件
28+
#log4j.appender.logfile.MaxBackupIndex=3
29+
## 配置logfile为自定义布局模式
30+
#log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
31+
#log4j.appender.logfile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %F %p %m%n
32+
#
33+
###########################
34+
## 对不同的类输出不同的日志文件
35+
###########################
36+
#
37+
## club.bagedate包下的日志单独输出
38+
#log4j.logger.club.bagedate=DEBUG,bagedate
39+
## 设置为false该日志信息就不会加入到rootLogger中了
40+
#log4j.additivity.club.bagedate=false
41+
## 下面就和上面配置一样了
42+
#log4j.appender.bagedate=org.apache.log4j.RollingFileAppender
43+
#log4j.appender.bagedate.Encoding=UTF-8
44+
#log4j.appender.bagedate.File=logs/bagedate.log
45+
#log4j.appender.bagedate.MaxFileSize=10MB
46+
#log4j.appender.bagedate.MaxBackupIndex=3
47+
#log4j.appender.bagedate.layout=org.apache.log4j.PatternLayout
48+
#log4j.appender.bagedate.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %F %p %m%n

0 commit comments

Comments
 (0)