Merge branch '3.1.x'

Closes gh-37446
spring-projects · Sep 18, 2023 · d4fe3bf · d4fe3bf
2 parents 77f0828 + af244e1
commit d4fe3bf
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/...t/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java b/...t/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java
@@ -104,6 +104,7 @@ private Appender<ILoggingEvent> consoleAppender(LogbackConfigurator config) {
 		ConsoleAppender<ILoggingEvent> appender = new ConsoleAppender<>();
 		ThresholdFilter filter = new ThresholdFilter();
 		filter.setLevel(resolve(config, "${CONSOLE_LOG_THRESHOLD}"));
+		filter.start();
 		appender.addFilter(filter);
 		PatternLayoutEncoder encoder = new PatternLayoutEncoder();
 		encoder.setPattern(resolve(config, "${CONSOLE_LOG_PATTERN}"));
@@ -118,6 +119,7 @@ private Appender<ILoggingEvent> fileAppender(LogbackConfigurator config, String
 		RollingFileAppender<ILoggingEvent> appender = new RollingFileAppender<>();
 		ThresholdFilter filter = new ThresholdFilter();
 		filter.setLevel(resolve(config, "${FILE_LOG_THRESHOLD}"));
+		filter.start();
 		appender.addFilter(filter);
 		PatternLayoutEncoder encoder = new PatternLayoutEncoder();
 		encoder.setPattern(resolve(config, "${FILE_LOG_PATTERN}"));

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
@@ -21,6 +21,7 @@
 import java.lang.reflect.Modifier;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.HashSet;
@@ -90,6 +91,7 @@
  * @author Eddú Meléndez
  * @author Scott Frederick
  * @author Jonatan Ivanov
+ * @author Moritz Halbritter
  */
 @ExtendWith(OutputCaptureExtension.class)
 class LogbackLoggingSystemTests extends AbstractLoggingSystemTests {
@@ -801,6 +803,29 @@ void whenConfigLocationIsXmlAndHasQueryParametersThenIllegalArgumentExceptionSho
 			.satisfies((ex) -> assertThat(ex.getCause()).isNotInstanceOf(IllegalArgumentException.class));
 	}
 
+	@Test
+	void shouldRespectConsoleThreshold(CapturedOutput output) {
+		this.environment.setProperty("logging.threshold.console", "warn");
+		this.loggingSystem.beforeInitialize();
+		initialize(this.initializationContext, null, null);
+		this.logger.info("Some info message");
+		this.logger.warn("Some warn message");
+		assertThat(output).doesNotContain("Some info message").contains("Some warn message");
+	}
+
+	@Test
+	void shouldRespectFileThreshold() {
+		this.environment.setProperty("logging.threshold.file", "warn");
+		this.loggingSystem.beforeInitialize();
+		initialize(this.initializationContext, null, getLogFile(null, tmpDir()));
+		this.logger.info("Some info message");
+		this.logger.warn("Some warn message");
+		Path file = Path.of(tmpDir(), "spring.log");
+		assertThat(file).content(StandardCharsets.UTF_8)
+			.doesNotContain("Some info message")
+			.contains("Some warn message");
+	}
+
 	private void initialize(LoggingInitializationContext context, String configLocation, LogFile logFile) {
 		this.loggingSystem.getSystemProperties((ConfigurableEnvironment) context.getEnvironment()).apply(logFile);
 		this.loggingSystem.beforeInitialize();