SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bumping versions

Browse Source
This commit is contained in:
buildmaster
2022-05-11 02:50:42 +00:00
parent ed2f2cc20a
commit 27acb917ce
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientRetryBootstrapper.java
View File

@@ -44,13 +44,12 @@ public class ConfigClientRetryBootstrapper implements BootstrapRegistryInitializ
if (resource.getProperties().isFailFast()) {
RetryProperties properties = resource.getRetryProperties();
RetryTemplate retryTemplate = RetryTemplateFactory.create(properties, resource.getLog());
return retryTemplate.execute(
retryContext -> {
if (resource.getLog().isDebugEnabled()) {
resource.getLog().debug("Retry: count=" + retryContext.getRetryCount());
}
return loadContext.getInvocation().apply(loadContext.getLoaderContext(), resource);
});
return retryTemplate.execute(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);
});

3
spring-cloud-config-sample/src/test/java/sample/ApplicationFailFastTests.java
View File

@@ -44,8 +44,7 @@ public class ApplicationFailFastTests {
new SpringApplicationBuilder().sources(Application.class).run("--server.port=0",
"--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",
"--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");