yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

fix for GP-142 - configure log4j in OSGi with system property

Browse source
This commit is contained in:
Jason P. Leasure 2020-09-04 16:17:55 -04:00
parent 17d5a14d42
commit fc3349b5ac
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Ghidra/Framework/Generic/src/main/java/ghidra/framework/LoggingInitialization.java
View file

@ -29,6 +29,8 @@ import resources.ResourceManager;
public class LoggingInitialization {
private static final String LOG4J_CONFIGURATION_PROPERTY = "log4j.configuration";
private static final String LOG4J2_CONFIGURATION_PROPERTY = "log4j.configurationFile";
private static final String PRODUCTION_LOGGING_CONFIGURATION_FILE = "generic.log4j.xml";
private static final String DEVELOPMENT_LOGGING_CONFIGURATION_FILE = "generic.log4jdev.xml";
@ -47,6 +49,9 @@ public class LoggingInitialization {
try {
LoggerContext context = (LoggerContext) LogManager.getContext(false);
context.setConfigLocation(resource.toURI());
// make future, unresolved contexts (e.g. from OSGi bundles) use this configuration
System.setProperty(LOG4J2_CONFIGURATION_PROPERTY, resource.toURI().toString());
}
catch (URISyntaxException e) {
Msg.error(LoggingInitialization.class, "Unable to convert URL to URI", e);
@ -58,7 +63,6 @@ public class LoggingInitialization {
(resource == null) ? "<no config file found>" : resource.toExternalForm();
Msg.info(LoggingInitialization.class, "Using log config file: " + configFilename);
Msg.info(LoggingInitialization.class, "Using log file: " + APPLICATION_LOG_FILE);
INITIALIZED = true;
}