Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cloud Foundry health should always show details

Browse Source 
Fixes gh-12014
This commit is contained in:
Madhura Bhave
2018-02-12 15:25:38 -08:00
parent f34aa6f4d8
commit 16a499b2fa
4 changed files with 147 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthEndpointWebExtension.java
View File

@@ -59,8 +59,8 @@ public class HealthEndpointWebExtension {
ShowDetails showDetails) {
Health health = this.delegate.health();
Integer status = this.statusHttpMapper.mapStatus(health.getStatus());
if (this.showDetails == ShowDetails.NEVER
|| (this.showDetails == ShowDetails.WHEN_AUTHENTICATED
if (showDetails == ShowDetails.NEVER
|| (showDetails == ShowDetails.WHEN_AUTHENTICATED
&& principal == null)) {
health = Health.status(health.getStatus()).build();
}

4
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ReactiveHealthEndpointWebExtension.java
View File

@@ -56,8 +56,8 @@ public class ReactiveHealthEndpointWebExtension {
ShowDetails showDetails) {
return this.delegate.health().map((health) -> {
Integer status = this.statusHttpMapper.mapStatus(health.getStatus());
if (this.showDetails == ShowDetails.NEVER
|| (this.showDetails == ShowDetails.WHEN_AUTHENTICATED
if (showDetails == ShowDetails.NEVER
|| (showDetails == ShowDetails.WHEN_AUTHENTICATED
&& principal == null)) {
health = Health.status(health.getStatus()).build();
}