From c880e10c41fa0a2a510b643aa6f1c65cc369f468 Mon Sep 17 00:00:00 2001 From: Valery_Yalauchuk Date: Sat, 23 Mar 2019 19:52:22 +0300 Subject: [PATCH] Fix LogFile conditions to check for exposure as well Closes gh-16298 --- .../logging/LogFileWebEndpointAutoConfiguration.java | 2 ++ .../LogFileWebEndpointAutoConfigurationTests.java | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointAutoConfiguration.java index a8e6808426..7f2af9ac85 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointAutoConfiguration.java @@ -17,6 +17,7 @@ package org.springframework.boot.actuate.autoconfigure.logging; import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint; +import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnExposedEndpoint; import org.springframework.boot.actuate.logging.LogFileWebEndpoint; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionMessage; @@ -42,6 +43,7 @@ import org.springframework.util.StringUtils; */ @Configuration(proxyBeanMethods = false) @ConditionalOnEnabledEndpoint(endpoint = LogFileWebEndpoint.class) +@ConditionalOnExposedEndpoint(endpoint = LogFileWebEndpoint.class) @EnableConfigurationProperties(LogFileWebEndpointProperties.class) public class LogFileWebEndpointAutoConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointAutoConfigurationTests.java index 11b91cf631..bcd048c0cd 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointAutoConfigurationTests.java @@ -92,6 +92,15 @@ public class LogFileWebEndpointAutoConfigurationTests { .doesNotHaveBean(LogFileWebEndpoint.class)); } + @Test + public void logFileWebEndpointCanBeExcluded() { + this.contextRunner + .withPropertyValues("logging.file.name:test.log", + "management.endpoints.web.exposure.exclude=logfile") + .run((context) -> assertThat(context) + .doesNotHaveBean(LogFileWebEndpoint.class)); + } + @Test public void logFileWebEndpointUsesConfiguredExternalFile() throws IOException { File file = this.temp.newFile();