diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientRetryBootstrapper.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientRetryBootstrapper.java index 71135273..bf551e27 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientRetryBootstrapper.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientRetryBootstrapper.java @@ -45,7 +45,12 @@ public class ConfigClientRetryBootstrapper implements BootstrapRegistryInitializ RetryProperties properties = resource.getRetryProperties(); RetryTemplate retryTemplate = RetryTemplateFactory.create(properties, resource.getLog()); return retryTemplate.execute( - retryContext -> loadContext.getInvocation().apply(loadContext.getLoaderContext(), resource)); + retryContext -> { + if (resource.getLog().isDebugEnabled()) { + resource.getLog().debug("Retry: count=" + retryContext.getRetryCount()); + } + return loadContext.getInvocation().apply(loadContext.getLoaderContext(), resource); + }); } return loadContext.getInvocation().apply(loadContext.getLoaderContext(), resource); }); diff --git a/spring-cloud-config-sample/src/test/java/sample/ApplicationFailFastTests.java b/spring-cloud-config-sample/src/test/java/sample/ApplicationFailFastTests.java index 8cebe0ed..6570fc81 100644 --- a/spring-cloud-config-sample/src/test/java/sample/ApplicationFailFastTests.java +++ b/spring-cloud-config-sample/src/test/java/sample/ApplicationFailFastTests.java @@ -45,6 +45,8 @@ public class ApplicationFailFastTests { "--spring.cloud.config.enabled=true", "--spring.cloud.config.fail-fast=true", "--spring.config.import=optional:configserver:http://serverhostdoesnotexist:1234", "--spring.cloud.config.server.enabled=false", + "--logging.level.org.springframework.retry=TRACE", + "--logging.level.org.springframework.cloud.config=TRACE", "--logging.level.org.springframework.boot.context.config=TRACE"); }).as("Exception not caused by fail fast").hasMessageContaining("fail fast"); assertThat(output).contains("Retry: count=5");