Skip to content

Commit

Permalink
Report Logback configuration errors when running in a native image
Browse files Browse the repository at this point in the history
Closes gh-34315
  • Loading branch information
wilkinsona committed Feb 21, 2023
1 parent 6983850 commit bc19e39
Showing 1 changed file with 10 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -207,7 +207,11 @@ private boolean initializeFromAotGeneratedArtifactsIfPossible(LoggingInitializat
stopAndReset(loggerContext);
SpringBootJoranConfigurator configurator = new SpringBootJoranConfigurator(initializationContext);
configurator.setContext(loggerContext);
return configurator.configureUsingAotGeneratedArtifacts();
boolean configuredUsingAotGeneratedArtifacts = configurator.configureUsingAotGeneratedArtifacts();
if (configuredUsingAotGeneratedArtifacts) {
reportConfigurationErrorsIfNecessary(loggerContext);
}
return configuredUsingAotGeneratedArtifacts;
}

@Override
Expand Down Expand Up @@ -241,6 +245,10 @@ protected void loadConfiguration(LoggingInitializationContext initializationCont
catch (Exception ex) {
throw new IllegalStateException("Could not initialize Logback logging from " + location, ex);
}
reportConfigurationErrorsIfNecessary(loggerContext);
}

private void reportConfigurationErrorsIfNecessary(LoggerContext loggerContext) {
List<Status> statuses = loggerContext.getStatusManager().getCopyOfStatusList();
StringBuilder errors = new StringBuilder();
for (Status status : statuses) {
Expand Down

0 comments on commit bc19e39

Please sign in to comment.