Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check for explicitly set logger config before overwriting it #70

Merged
merged 1 commit into from
Jan 16, 2024
Merged

Check for explicitly set logger config before overwriting it #70

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions loader/src/main/java/net/neoforged/fml/loading/targets/CommonLaunchHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,26 @@ public void configureTransformationClassLoader(final ITransformingClassLoaderBui
}

protected String[] preLaunch(String[] arguments, ModuleLayer layer) {
// do not overwrite the logging configuration if the user explicitly set another one
if (System.getProperty("log4j2.configurationFile") == null) {
overwriteLoggingConfiguration(layer);
}

return arguments;
}

/**
* Forces the log4j2 logging context to use the configuration shipped with fml_loader.
*/
private void overwriteLoggingConfiguration(final ModuleLayer layer) {
URI uri;
try (var reader = layer.configuration().findModule("fml_loader").orElseThrow().reference().open()) {
uri = reader.find("log4j2.xml").orElseThrow();
} catch (IOException e) {
throw new RuntimeException(e);
}

// Force the log4j2 configuration to be loaded from fmlloader
Configurator.reconfigure(ConfigurationFactory.getInstance().getConfiguration(LoggerContext.getContext(), ConfigurationSource.fromUri(uri)));

return arguments;
}

protected final String[] getLegacyClasspath() {
Expand Down
Loading