You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by ca...@apache.org on 2023/06/26 00:46:42 UTC
[doris] branch master updated: [fix](log4j) fix some issues when modify log config (#21099)
This is an automated email from the ASF dual-hosted git repository.
caiconghui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new f8ef4ed18f [fix](log4j) fix some issues when modify log config (#21099)
f8ef4ed18f is described below
commit f8ef4ed18f92d209caba0f6ea9842230dfe7dc75
Author: caiconghui <55...@users.noreply.github.com>
AuthorDate: Mon Jun 26 08:46:33 2023 +0800
[fix](log4j) fix some issues when modify log config (#21099)
Co-authored-by: caiconghui1 <ca...@jd.com>
---
fe/fe-core/src/main/java/org/apache/doris/common/Log4jConfig.java | 6 +++---
.../java/org/apache/doris/httpv2/controller/LogController.java | 7 ++++---
ui/src/pages/logs/index.tsx | 3 ++-
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/Log4jConfig.java b/fe/fe-core/src/main/java/org/apache/doris/common/Log4jConfig.java
index 7163a58418..b4300ca426 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/Log4jConfig.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/Log4jConfig.java
@@ -47,7 +47,7 @@ public class Log4jConfig extends XmlConfiguration {
+ " <Pattern>%d{yyyy-MM-dd HH:mm:ss,SSS} %p (%t|%tid)<!--REPLACED BY LOG FORMAT-->%m%n</Pattern>\n"
+ " </PatternLayout>\n"
+ " </Console>"
- + " <RollingFile name=\"Sys\" fileName=\"${sys_log_dir}/fe.log\" filePattern=\"${sys_log_dir}/fe.log.${sys_file_pattern}-%i\">\n"
+ + " <RollingFile name=\"Sys\" fileName=\"${sys_log_dir}/fe.log\" filePattern=\"${sys_log_dir}/fe.log.${sys_file_pattern}-%i\" immediateFlush=\"${immediate_flush_flag}\">\n"
+ " <PatternLayout charset=\"UTF-8\">\n"
+ " <Pattern>%d{yyyy-MM-dd HH:mm:ss,SSS} %p (%t|%tid)<!--REPLACED BY LOG FORMAT-->%m%n</Pattern>\n"
+ " </PatternLayout>\n"
@@ -62,7 +62,7 @@ public class Log4jConfig extends XmlConfiguration {
+ " </Delete>\n"
+ " </DefaultRolloverStrategy>\n"
+ " </RollingFile>\n"
- + " <RollingFile name=\"SysWF\" fileName=\"${sys_log_dir}/fe.warn.log\" filePattern=\"${sys_log_dir}/fe.warn.log.${sys_file_pattern}-%i\">\n"
+ + " <RollingFile name=\"SysWF\" fileName=\"${sys_log_dir}/fe.warn.log\" filePattern=\"${sys_log_dir}/fe.warn.log.${sys_file_pattern}-%i\" immediateFlush=\"${immediate_flush_flag}\">\n"
+ " <PatternLayout charset=\"UTF-8\">\n"
+ " <Pattern>%d{yyyy-MM-dd HH:mm:ss,SSS} %p (%t|%tid)<!--REPLACED BY LOG FORMAT-->%m%n</Pattern>\n"
+ " </PatternLayout>\n"
@@ -94,7 +94,7 @@ public class Log4jConfig extends XmlConfiguration {
+ " </RollingFile>\n"
+ " </Appenders>\n"
+ " <Loggers>\n"
- + " <Root level=\"${sys_log_level}\" includeLocation=\"${include_location_flag}\" immediateFlush=\"${immediate_flush_flag}\">\n"
+ + " <Root level=\"${sys_log_level}\" includeLocation=\"${include_location_flag}\">\n"
+ " <AppenderRef ref=\"Sys\"/>\n"
+ " <AppenderRef ref=\"SysWF\" level=\"WARN\"/>\n"
+ " <!--REPLACED BY Console Logger-->\n"
diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LogController.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LogController.java
index dc7878b757..908f64814f 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LogController.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/controller/LogController.java
@@ -90,7 +90,7 @@ public class LogController {
}
if (!Strings.isNullOrEmpty(delVerboseName)) {
delVerboseName = delVerboseName.trim();
- List<String> verboseNames = Lists.newArrayList(configs.y);
+ List<String> verboseNames = Lists.newArrayList(configs.z);
if (verboseNames.contains(delVerboseName)) {
verboseNames.remove(delVerboseName);
configs = Log4jConfig.updateLogging(null, null,
@@ -100,8 +100,9 @@ public class LogController {
}
map.put("Level", configs.x);
- map.put("VerboseNames", StringUtils.join(configs.y, ","));
- map.put("AuditNames", StringUtils.join(configs.z, ","));
+ map.put("Mode", configs.y);
+ map.put("VerboseNames", StringUtils.join(configs.z, ","));
+ map.put("AuditNames", StringUtils.join(configs.u, ","));
content.put("LogConfiguration", map);
} catch (IOException e) {
LOG.error(e);
diff --git a/ui/src/pages/logs/index.tsx b/ui/src/pages/logs/index.tsx
index 403a8d056d..d50716a143 100644
--- a/ui/src/pages/logs/index.tsx
+++ b/ui/src/pages/logs/index.tsx
@@ -56,7 +56,8 @@ export default function Logs(params: any) {
<Typography style={{padding: '30px'}}>
<Title>Log Configuration</Title>
<Paragraph>
- <p>Level: {LogConfiguration.VerboseNames}</p>
+ <p>Level: {LogConfiguration.Level}</p>
+ <p>Mode: {LogConfiguration.Mode}</p>
<p>Verbose Names:{LogConfiguration.VerboseNames}</p>
<p>Audit Names: {LogConfiguration.AuditNames}</p>
</Paragraph>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org