Merge branch '3.0.x' into 3.1.x

Closes gh-37600
spring-projects · Sep 27, 2023 · 0368fc5 · 0368fc5
2 parents 5015327 + 688a69b
commit 0368fc5
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 21 deletions.
diff --git a/...ing-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java b/...ing-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
@@ -30,6 +30,7 @@
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.joran.JoranConfigurator;
 import ch.qos.logback.classic.jul.LevelChangePropagator;
+import ch.qos.logback.classic.spi.TurboFilterList;
 import ch.qos.logback.classic.turbo.TurboFilter;
 import ch.qos.logback.core.joran.spi.JoranException;
 import ch.qos.logback.core.spi.FilterReply;
@@ -218,33 +219,37 @@ private boolean initializeFromAotGeneratedArtifactsIfPossible(LoggingInitializat
 	protected void loadDefaults(LoggingInitializationContext initializationContext, LogFile logFile) {
 		LoggerContext context = getLoggerContext();
 		stopAndReset(context);
-		boolean debug = Boolean.getBoolean("logback.debug");
-		if (debug) {
-			StatusListenerConfigHelper.addOnConsoleListenerInstance(context, new OnConsoleStatusListener());
-		}
-		Environment environment = initializationContext.getEnvironment();
-		// Apply system properties directly in case the same JVM runs multiple apps
-		new LogbackLoggingSystemProperties(environment, context::putProperty).apply(logFile);
-		LogbackConfigurator configurator = debug ? new DebugLogbackConfigurator(context)
-				: new LogbackConfigurator(context);
-		new DefaultLogbackConfiguration(logFile).apply(configurator);
-		context.setPackagingDataEnabled(true);
+		withLoggingSuppressed(() -> {
+			boolean debug = Boolean.getBoolean("logback.debug");
+			if (debug) {
+				StatusListenerConfigHelper.addOnConsoleListenerInstance(context, new OnConsoleStatusListener());
+			}
+			Environment environment = initializationContext.getEnvironment();
+			// Apply system properties directly in case the same JVM runs multiple apps
+			new LogbackLoggingSystemProperties(environment, context::putProperty).apply(logFile);
+			LogbackConfigurator configurator = debug ? new DebugLogbackConfigurator(context)
+					: new LogbackConfigurator(context);
+			new DefaultLogbackConfiguration(logFile).apply(configurator);
+			context.setPackagingDataEnabled(true);
+		});
 	}
 
 	@Override
 	protected void loadConfiguration(LoggingInitializationContext initializationContext, String location,
 			LogFile logFile) {
-		if (initializationContext != null) {
-			applySystemProperties(initializationContext.getEnvironment(), logFile);
-		}
 		LoggerContext loggerContext = getLoggerContext();
 		stopAndReset(loggerContext);
-		try {
-			configureByResourceUrl(initializationContext, loggerContext, ResourceUtils.getURL(location));
-		}
-		catch (Exception ex) {
-			throw new IllegalStateException("Could not initialize Logback logging from " + location, ex);
-		}
+		withLoggingSuppressed(() -> {
+			if (initializationContext != null) {
+				applySystemProperties(initializationContext.getEnvironment(), logFile);
+			}
+			try {
+				configureByResourceUrl(initializationContext, loggerContext, ResourceUtils.getURL(location));
+			}
+			catch (Exception ex) {
+				throw new IllegalStateException("Could not initialize Logback logging from " + location, ex);
+			}
+		});
 		reportConfigurationErrorsIfNecessary(loggerContext);
 	}
 
@@ -448,6 +453,17 @@ public BeanFactoryInitializationAotContribution processAheadOfTime(ConfigurableL
 		return contribution;
 	}
 
+	private void withLoggingSuppressed(Runnable action) {
+		TurboFilterList turboFilters = getLoggerContext().getTurboFilterList();
+		turboFilters.add(FILTER);
+		try {
+			action.run();
+		}
+		finally {
+			turboFilters.remove(FILTER);
+		}
+	}
+
 	/**
 	 * {@link LoggingSystemFactory} that returns {@link LogbackLoggingSystem} if possible.
 	 */

diff --git a/...oot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java b/...oot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java
@@ -58,12 +58,14 @@
 import org.springframework.boot.logging.LoggingInitializationContext;
 import org.springframework.boot.logging.LoggingSystem;
 import org.springframework.boot.logging.LoggingSystemProperties;
+import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
 import org.springframework.boot.testsupport.classpath.ClassPathOverrides;
 import org.springframework.boot.testsupport.system.CapturedOutput;
 import org.springframework.boot.testsupport.system.OutputCaptureExtension;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.ConfigurableConversionService;
 import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.MapPropertySource;
 import org.springframework.mock.env.MockEnvironment;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.util.ReflectionUtils;
@@ -91,6 +93,7 @@
  * @author Moritz Halbritter
  */
 @ExtendWith(OutputCaptureExtension.class)
+@ClassPathExclusions({ "log4j-core-*.jar", "log4j-api-*.jar" })
 class LogbackLoggingSystemTests extends AbstractLoggingSystemTests {
 
 	private final LogbackLoggingSystem loggingSystem = new LogbackLoggingSystem(getClass().getClassLoader());
@@ -125,7 +128,7 @@ void cleanUp() {
 	}
 
 	@Test
-	@ClassPathOverrides("org.jboss.logging:jboss-logging:3.5.0.Final")
+	@ClassPathOverrides({ "org.jboss.logging:jboss-logging:3.5.0.Final", "org.apache.logging.log4j:log4j-core:2.19.0" })
 	void jbossLoggingRoutesThroughLog4j2ByDefault() {
 		System.getProperties().remove("org.jboss.logging.provider");
 		org.jboss.logging.Logger jbossLogger = org.jboss.logging.Logger.getLogger(getClass());
@@ -731,6 +734,15 @@ void shouldRespectFileThreshold() {
 			.contains("Some warn message");
 	}
 
+	@Test
+	void applyingSystemPropertiesDoesNotCauseUnwantedStatusWarnings(CapturedOutput output) {
+		this.loggingSystem.beforeInitialize();
+		this.environment.getPropertySources()
+			.addFirst(new MapPropertySource("test", Map.of("logging.pattern.console", "[CONSOLE]%m")));
+		this.loggingSystem.initialize(this.initializationContext, "classpath:logback-nondefault.xml", null);
+		assertThat(output).doesNotContain("WARN");
+	}
+
 	private void initialize(LoggingInitializationContext context, String configLocation, LogFile logFile) {
 		this.loggingSystem.getSystemProperties((ConfigurableEnvironment) context.getEnvironment()).apply(logFile);
 		this.loggingSystem.initialize(context, configLocation, logFile);