Skip to content

Fix readiness check details lost #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
QilongZhang merged 2 commits into from
Nov 8, 2018
Merged

Fix readiness check details lost #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a625d0
fix readiness health check fail
straybirdzls Nov 8, 2018
b175c42
format
straybirdzls Nov 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...rter/src/main/java/com/alipay/sofa/healthcheck/service/ReadinessEndpointWebExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.springframework.boot.actuate.endpoint.web.annotation.EndpointWebExtension;
import org.springframework.boot.actuate.health.Health;
import org.springframework.boot.actuate.health.HealthWebEndpointResponseMapper;
import org.springframework.boot.actuate.health.ShowDetails;

/**
* @author qilong.zql
Expand All @@ -39,7 +40,7 @@ public class ReadinessEndpointWebExtension {

@ReadOperation
public WebEndpointResponse<Health> getHealth(SecurityContext securityContext) {
return this.responseMapper.map(this.delegate.health(), securityContext);
return this.responseMapper.map(this.delegate.health(), securityContext, ShowDetails.ALWAYS);
}

}
11 changes: 7 additions & 4 deletions ...st/java/com/alipay/sofa/healthcheck/usercases/HealthEndpointDefaultConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import com.alipay.sofa.healthcheck.base.SofaBootTestApplication;
import com.alipay.sofa.healthcheck.service.SofaBootReadinessCheckEndpoint;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
Expand All @@ -27,7 +28,6 @@
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.util.Assert;

/**
* @author qilong.zql
Expand All @@ -44,17 +44,20 @@ public class HealthEndpointDefaultConfigurationTest {
private TestRestTemplate restTemplate;

@Test
public void testReadinessCheckSuccessHttpCode() {
public void testReadinessCheckSuccess() {
ResponseEntity<String> response = restTemplate.getForEntity("/actuator/readiness",
String.class);
org.junit.Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
Assert.assertNotNull(response.getBody());
Assert.assertTrue(response.getBody().contains(
"\"details\":{\"SOFABootReadinessHealthCheckInfo\":{\"status\":\"UP\"}"));
}

@Test
public void test() {
SofaBootReadinessCheckEndpoint sofaBootReadinessCheckEndpoint = ctx
.getBean(SofaBootReadinessCheckEndpoint.class);
Assert.notNull(sofaBootReadinessCheckEndpoint);
Assert.assertNotNull(sofaBootReadinessCheckEndpoint);
}

}