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

Do not set status to down. (#4102)

Browse Source
This commit is contained in:
Olga Maciaszek-Sharma
2022-06-13 18:57:46 +02:00
committed by GitHub
parent ec903900c9
commit a5e038cf13
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaHealthCheckHandler.java
View File

@@ -70,7 +70,7 @@ public class EurekaHealthCheckHandler
private static final Map<Status, InstanceInfo.InstanceStatus> STATUS_MAPPING = new HashMap<Status, InstanceInfo.InstanceStatus>() {
{
put(Status.UNKNOWN, InstanceStatus.UNKNOWN);
put(Status.OUT_OF_SERVICE, InstanceStatus.OUT_OF_SERVICE);
put(Status.OUT_OF_SERVICE, InstanceStatus.DOWN);
put(Status.DOWN, InstanceStatus.DOWN);
put(Status.UP, InstanceStatus.UP);
}

17
spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/healthcheck/EurekaHealthCheckTests.java
View File

@@ -36,6 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* Tests the Eureka health check handler.
*
* @author Jakub Narloch
* @author Olga Maciaszek-Sharma
*/
@SpringBootTest(classes = EurekaHealthCheckTests.EurekaHealthCheckApplication.class,
webEnvironment = WebEnvironment.RANDOM_PORT, value = { "eureka.client.healthcheck.enabled=true", "debug=true" })
@@ -47,12 +48,24 @@ class EurekaHealthCheckTests {
@Test
void shouldRegisterService() {
System.setProperty("status", "UP");
InstanceInfo.InstanceStatus status = this.discoveryClient.getHealthCheckHandler()
.getStatus(InstanceInfo.InstanceStatus.UNKNOWN);
assertThat(status).isNotNull();
assertThat(status).isEqualTo(InstanceInfo.InstanceStatus.OUT_OF_SERVICE);
assertThat(status).isEqualTo(InstanceInfo.InstanceStatus.UP);
}
@Test
void shouldMapOutOfServiceToDown() {
System.setProperty("status", "OUT_OF_SERVICE");
InstanceInfo.InstanceStatus status = this.discoveryClient.getHealthCheckHandler()
.getStatus(InstanceInfo.InstanceStatus.UNKNOWN);
assertThat(status).isNotNull();
assertThat(status).isEqualTo(InstanceInfo.InstanceStatus.DOWN);
}
@Configuration(proxyBeanMethods = false)
@@ -61,7 +74,7 @@ class EurekaHealthCheckTests {
@Bean
public HealthIndicator healthIndicator() {
return () -> new Health.Builder().outOfService().build();
return () -> new Health.Builder().status(System.getProperty("status")).build();
}
}