root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Andy Wilkinson 2017-01-17 15:00:01 +00:00
parent d76e1ef95e a02c2d4155
commit 7fa33cddd7
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/OrderedHealthAggregator.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2014 the original author or authors. * Copyright 2012-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

11
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Status.java
View File

@ -38,22 +38,25 @@ import org.springframework.util.ObjectUtils;
public final class Status { public final class Status {
/** /**
* Convenient constant value representing unknown state. * {@link Status} indicating that the component or subsystem is in an unknown state.
*/ */
public static final Status UNKNOWN = new Status("UNKNOWN"); public static final Status UNKNOWN = new Status("UNKNOWN");
/** /**
* Convenient constant value representing up state. * {@link Status} indicating that the component or subsystem is functioning as
* expected.
*/ */
public static final Status UP = new Status("UP"); public static final Status UP = new Status("UP");
/** /**
* Convenient constant value representing down state. * {@link Status} indicating that the component or subsystem has suffered an
* unexpected failure.
*/ */
public static final Status DOWN = new Status("DOWN"); public static final Status DOWN = new Status("DOWN");
/** /**
* Convenient constant value representing out-of-service state. * {@link Status} indicating that the component or subsystem has been taken out of
* service and should not be used.
*/ */
public static final Status OUT_OF_SERVICE = new Status("OUT_OF_SERVICE"); public static final Status OUT_OF_SERVICE = new Status("OUT_OF_SERVICE");

2
spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
View File

@ -1120,7 +1120,7 @@ content into your application; rather pick only the properties that you need.
management.health.rabbit.enabled=true # Enable RabbitMQ health check. management.health.rabbit.enabled=true # Enable RabbitMQ health check.
management.health.redis.enabled=true # Enable Redis health check. management.health.redis.enabled=true # Enable Redis health check.
management.health.solr.enabled=true # Enable Solr health check. management.health.solr.enabled=true # Enable Solr health check.
management.health.status.order=DOWN, OUT_OF_SERVICE, UNKNOWN, UP # Comma-separated list of health statuses in order of severity. management.health.status.order=DOWN, OUT_OF_SERVICE, UP, UNKNOWN # Comma-separated list of health statuses in order of severity.
# INFO CONTRIBUTORS ({sc-spring-boot-actuator}/autoconfigure/InfoContributorProperties.{sc-ext}[InfoContributorProperties]) # INFO CONTRIBUTORS ({sc-spring-boot-actuator}/autoconfigure/InfoContributorProperties.{sc-ext}[InfoContributorProperties])
management.info.build.enabled=true # Enable build info. management.info.build.enabled=true # Enable build info.