From 978f80122b9138f5606bd9e33597807b90129d61 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 27 Feb 2019 13:37:18 +0100 Subject: [PATCH] Polish "Debug mode is not logging web and sql related loggers" Closes gh-16018 --- .../context/logging/LoggingApplicationListener.java | 4 +--- .../logging/LoggingApplicationListenerTests.java | 11 ++++------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/logging/LoggingApplicationListener.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/logging/LoggingApplicationListener.java index 8ba14af1be..e9415ac11a 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/logging/LoggingApplicationListener.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/logging/LoggingApplicationListener.java @@ -21,7 +21,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.commons.logging.Log; @@ -321,8 +320,7 @@ public class LoggingApplicationListener implements GenericApplicationListener { } protected void initializeLogLevel(LoggingSystem system, LogLevel level) { - Optional.ofNullable(LOG_LEVEL_LOGGERS.get(level)).orElse(Collections.emptyList()) - .stream() + LOG_LEVEL_LOGGERS.getOrDefault(level, Collections.emptyList()).stream() .flatMap((logger) -> DEFAULT_GROUP_LOGGERS .getOrDefault(logger, Collections.singletonList(logger)).stream()) .forEach((logger) -> system.setLogLevel(logger, level)); diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/logging/LoggingApplicationListenerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/logging/LoggingApplicationListenerTests.java index 03627fb478..b0a4d71167 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/logging/LoggingApplicationListenerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/logging/LoggingApplicationListenerTests.java @@ -264,15 +264,12 @@ public class LoggingApplicationListenerTests { @Test public void parseDebugArgExpandGroups() { - addPropertiesToEnvironment(this.context, "debug"); + TestPropertySourceUtils.addInlinedPropertiesToEnvironment(this.context, "debug"); this.initializer.initialize(this.context.getEnvironment(), this.context.getClassLoader()); - ch.qos.logback.classic.Logger sqlGroup = this.loggerContext - .getLogger("org.hibernate.SQL"); - ch.qos.logback.classic.Logger webGroup = this.loggerContext - .getLogger("org.springframework.boot.actuate.endpoint.web"); - webGroup.debug("testdebugwebgroup"); - sqlGroup.debug("testdebugsqlgroup"); + this.logFactory.getInstance("org.springframework.boot.actuate.endpoint.web") + .debug("testdebugwebgroup"); + this.logFactory.getInstance("org.hibernate.SQL").debug("testdebugsqlgroup"); assertThat(this.outputCapture.toString()).contains("testdebugwebgroup"); assertThat(this.outputCapture.toString()).contains("testdebugsqlgroup"); }