Skip to content

Commit d12b6b3

Browse files
committed
Disable LogbackLoggingSystem's XML support when spring.xml.ignore=true
Closes gh-22106
1 parent 2dd4a9c commit d12b6b3

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import org.springframework.boot.logging.LoggingSystem;
5050
import org.springframework.boot.logging.LoggingSystemProperties;
5151
import org.springframework.boot.logging.Slf4JLoggingSystem;
52+
import org.springframework.core.SpringProperties;
5253
import org.springframework.core.env.Environment;
5354
import org.springframework.util.Assert;
5455
import org.springframework.util.ResourceUtils;
@@ -65,6 +66,9 @@
6566
*/
6667
public class LogbackLoggingSystem extends Slf4JLoggingSystem {
6768

69+
// Static final field to facilitate code removal by Graal
70+
private static final boolean XML_ENABLED = !SpringProperties.getFlag("spring.xml.ignore");
71+
6872
private static final String CONFIGURATION_FILE_PROPERTY = "logback.configurationFile";
6973

7074
private static final LogLevels<Level> LEVELS = new LogLevels<>();
@@ -172,7 +176,7 @@ protected void loadConfiguration(LoggingInitializationContext initializationCont
172176

173177
private void configureByResourceUrl(LoggingInitializationContext initializationContext, LoggerContext loggerContext,
174178
URL url) throws JoranException {
175-
if (url.toString().endsWith("xml")) {
179+
if (XML_ENABLED && url.toString().endsWith("xml")) {
176180
JoranConfigurator configurator = new SpringBootJoranConfigurator(initializationContext);
177181
configurator.setContext(loggerContext);
178182
configurator.doConfigure(url);

0 commit comments

Comments
 (0)