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

Merging PR #446 into master.

Browse Source
This commit is contained in:
Ryan Baxter
2017-01-10 14:55:32 -05:00
parent 5b442e9526
commit 583893a29d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/SleuthFeignBuilder.java
View File

@@ -16,6 +16,7 @@
package org.springframework.cloud.sleuth.instrument.web.client.feign;
import feign.Retryer;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
@@ -35,7 +36,7 @@ final class SleuthFeignBuilder {
private SleuthFeignBuilder() {}
static Feign.Builder builder(BeanFactory beanFactory) {
return Feign.builder()
return Feign.builder().retryer(Retryer.NEVER_RETRY)
.client(client(beanFactory));
}

3
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/SleuthHystrixFeignBuilder.java
View File

@@ -16,6 +16,7 @@
package org.springframework.cloud.sleuth.instrument.web.client.feign;
import feign.Retryer;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
@@ -37,7 +38,7 @@ final class SleuthHystrixFeignBuilder {
private SleuthHystrixFeignBuilder() {}
static Feign.Builder builder(BeanFactory beanFactory) {
return HystrixFeign.builder()
return HystrixFeign.builder().retryer(Retryer.NEVER_RETRY)
.client(client(beanFactory));
}