From 093354e23130741e6e4493a931d8b3641f6c4971 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Wed, 24 Feb 2016 09:14:29 +0000 Subject: [PATCH] Check if client is in bootstrap and default to not register Eureka now has the option (maybe always there) to not register and that's a sensible default in the bootstrap phase (when we might not know the port yet). --- .../netflix/eureka/EurekaClientAutoConfiguration.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java index d210986f..55d200dc 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java @@ -93,7 +93,13 @@ public class EurekaClientAutoConfiguration { @Bean @ConditionalOnMissingBean(value = EurekaClientConfig.class, search = SearchStrategy.CURRENT) public EurekaClientConfigBean eurekaClientConfigBean() { - return new EurekaClientConfigBean(); + EurekaClientConfigBean client = new EurekaClientConfigBean(); + if ("bootstrap".equals(this.env.getProperty("spring.config.name"))) { + // We don't register during bootstrap by default, but there will be another + // chance later. + client.setRegisterWithEureka(false); + } + return client; } @Bean