Skip to content

Commit 7aa27e1

Browse files
committed
Merge branch '3.0.x'
Closes gh-34320
2 parents d2c4e8d + bc19e39 commit 7aa27e1

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2022 the original author or authors.
2+
* Copyright 2012-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -212,7 +212,11 @@ private boolean initializeFromAotGeneratedArtifactsIfPossible(LoggingInitializat
212212
SpringBootJoranConfigurator configurator = new SpringBootJoranConfigurator(initializationContext,
213213
configurators);
214214
configurator.setContext(loggerContext);
215-
return configurator.configureUsingAotGeneratedArtifacts();
215+
boolean configuredUsingAotGeneratedArtifacts = configurator.configureUsingAotGeneratedArtifacts();
216+
if (configuredUsingAotGeneratedArtifacts) {
217+
reportConfigurationErrorsIfNecessary(loggerContext);
218+
}
219+
return configuredUsingAotGeneratedArtifacts;
216220
}
217221

218222
@Override
@@ -246,6 +250,10 @@ protected void loadConfiguration(LoggingInitializationContext initializationCont
246250
catch (Exception ex) {
247251
throw new IllegalStateException("Could not initialize Logback logging from " + location, ex);
248252
}
253+
reportConfigurationErrorsIfNecessary(loggerContext);
254+
}
255+
256+
private void reportConfigurationErrorsIfNecessary(LoggerContext loggerContext) {
249257
List<Status> statuses = loggerContext.getStatusManager().getCopyOfStatusList();
250258
StringBuilder errors = new StringBuilder();
251259
for (Status status : statuses) {

0 commit comments

Comments
 (0)