[Enhancement](log) Improve Safety and Robustness of Log4j Configuration

apache · Oct 9, 2023 · 3bdaf8c · 3bdaf8c
1 parent f8e4cef
commit 3bdaf8c
Showing 1 changed file with 14 additions and 5 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
@@ -29,6 +29,7 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 //
@@ -228,12 +229,20 @@ private static void reconfig() throws IOException {
  SpringLog4j2Config.writeSpringLogConf(customConfDir);
 
  // new SimpleLog4jConfiguration with xmlConfTemplate
- ByteArrayInputStream bis = new ByteArrayInputStream(newXmlConfTemplate.getBytes("UTF-8"));
- ConfigurationSource source = new ConfigurationSource(bis);
- Log4jConfig config = new Log4jConfig(source);
+ if (newXmlConfTemplate == null || newXmlConfTemplate.isEmpty()) {
+ throw new IOException("The configuration template is empty!");
+ }
+
+ Log4jConfig config;
+ try (ByteArrayInputStream bis = new ByteArrayInputStream(newXmlConfTemplate.getBytes(StandardCharsets.UTF_8))) {
+ ConfigurationSource source = new ConfigurationSource(bis);
+ config = new Log4jConfig(source);
 
- LoggerContext context = (LoggerContext) LogManager.getContext(false);
- context.start(config);
+ LoggerContext context = (LoggerContext) LogManager.getContext(LogManager.class.getClassLoader(), false);
+ context.start(config);
+ } catch (Exception e) {
+ throw new IOException("Error occurred while configuring Log4j", e);
+ }
  }
 
  public static String getLogXmlConfTemplate() {