database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zy-kkk
2023-10-09 06:44:37 -05:00
committed by GitHub
parent f8eb36158a
commit 400b9f2f97
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
fe/fe-core/src/main/java/org/apache/doris/common/Log4jConfig.java
View File

@ -29,6 +29,7 @@ import org.apache.logging.log4j.core.lookup.StrSubstitutor;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Map;
//
@ -228,12 +229,20 @@ public class Log4jConfig extends XmlConfiguration {
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!");
}
LoggerContext context = (LoggerContext) LogManager.getContext(false);
context.start(config);
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(LogManager.class.getClassLoader(), false);
context.start(config);
} catch (Exception e) {
throw new IOException("Error occurred while configuring Log4j", e);
}
}
public static String getLogXmlConfTemplate() {