From 161b54b1d4c35ce9d382b77dbf153645e6005295 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 2 May 2023 18:29:52 +0100 Subject: [PATCH] Set Logback's root log level to INFO as early as possible Closes gh-35238 --- .../logback/RootLogLevelConfigurator.java | 40 ++++++++++++++++++ .../ch.qos.logback.classic.spi.Configurator | 1 + .../RootLogLevelConfiguratorTests.java | 42 +++++++++++++++++++ 3 files changed, 83 insertions(+) create mode 100644 spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/RootLogLevelConfigurator.java create mode 100644 spring-boot-project/spring-boot/src/main/resources/META-INF/services/ch.qos.logback.classic.spi.Configurator create mode 100644 spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/RootLogLevelConfiguratorTests.java diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/RootLogLevelConfigurator.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/RootLogLevelConfigurator.java new file mode 100644 index 00000000000..f7b1e152d8a --- /dev/null +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/RootLogLevelConfigurator.java @@ -0,0 +1,40 @@ +/* + * Copyright 2012-2023 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.boot.logging.logback; + +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.spi.Configurator; +import ch.qos.logback.core.spi.ContextAwareBase; +import org.slf4j.Logger; + +/** + * Logback {@link Configurator}, registered through {@code META-INF/services}, that sets + * the root log level to {@link Level#INFO}. + * + * @author Andy Wilkinson + * @since 3.1.0 + */ +public class RootLogLevelConfigurator extends ContextAwareBase implements Configurator { + + @Override + public ExecutionStatus configure(LoggerContext loggerContext) { + loggerContext.getLogger(Logger.ROOT_LOGGER_NAME).setLevel(Level.INFO); + return ExecutionStatus.INVOKE_NEXT_IF_ANY; + } + +} diff --git a/spring-boot-project/spring-boot/src/main/resources/META-INF/services/ch.qos.logback.classic.spi.Configurator b/spring-boot-project/spring-boot/src/main/resources/META-INF/services/ch.qos.logback.classic.spi.Configurator new file mode 100644 index 00000000000..d6d60e35bb9 --- /dev/null +++ b/spring-boot-project/spring-boot/src/main/resources/META-INF/services/ch.qos.logback.classic.spi.Configurator @@ -0,0 +1 @@ +org.springframework.boot.logging.logback.RootLogLevelConfigurator \ No newline at end of file diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/RootLogLevelConfiguratorTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/RootLogLevelConfiguratorTests.java new file mode 100644 index 00000000000..49749ab77f3 --- /dev/null +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/RootLogLevelConfiguratorTests.java @@ -0,0 +1,42 @@ +/* + * Copyright 2012-2023 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.boot.logging.logback; + +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.spi.Configurator.ExecutionStatus; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for {@link RootLogLevelConfigurator}. + * + * @author Andy Wilkinson + */ +class RootLogLevelConfiguratorTests { + + @Test + void shouldSetRootLogLevelToInfo() { + LoggerContext context = new LoggerContext(); + assertThat(context.getLogger(Logger.ROOT_LOGGER_NAME).getLevel()).isEqualTo(Level.DEBUG); + assertThat(new RootLogLevelConfigurator().configure(context)).isEqualTo(ExecutionStatus.INVOKE_NEXT_IF_ANY); + assertThat(context.getLogger(Logger.ROOT_LOGGER_NAME).getLevel()).isEqualTo(Level.INFO); + } + +}