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

Introduced a new status for open circuits in the /health endpoint

Browse Source
This commit is contained in:
Christian Dupuis
2014-10-28 12:57:56 +01:00
parent cbec02092f
commit 77b6641ac1
3 changed files with 11 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixAutoConfiguration.java
View File

@@ -16,14 +16,8 @@
package org.springframework.cloud.netflix.hystrix;
import java.util.List;
import javax.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.actuate.health.OrderedHealthAggregator;
import org.springframework.boot.actuate.health.Status;
import org.springframework.boot.actuate.autoconfigure.HealthIndicatorAutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.context.annotation.Bean;
@@ -36,30 +30,15 @@ import com.netflix.hystrix.Hystrix;
* @author Christian Dupuis
*/
@Configuration
@AutoConfigureAfter({HealthIndicatorAutoConfiguration.class})
public class HystrixAutoConfiguration {
@Configuration
@ConditionalOnClass(Hystrix.class)
@ConditionalOnExpression("${health.db.enabled:true}")
@ConditionalOnExpression("${health.hystrix.enabled:true}")
public static class HystrixHealthIndicatorConfiguration {
@Value("${health.status.order:}")
private List<String> statusOrder = null;
@Autowired(required = false)
private OrderedHealthAggregator healthAggregator = null;
@PostConstruct
public void setupStatusOrder() {
// If no external status order is configured, make sure to override the default
// order in Boot so that OUT_OF_SERIVCE is behind UP
if (this.healthAggregator != null && this.statusOrder == null) {
this.healthAggregator.setStatusOrder(Status.DOWN, Status.UP, Status.OUT_OF_SERVICE, Status.UNKNOWN);
}
}
@Bean
@ConditionalOnExpression("${health.hystrix.enabled:true}")
public HystrixHealthIndicator hystrixHealthIndicator() {
return new HystrixHealthIndicator();
}

1
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixConfiguration.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cloud.netflix.hystrix;
import java.io.IOException;

20
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixHealthIndicator.java
View File

@@ -11,19 +11,7 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.67uiktfhoeuh ghhpgb8ptrlzzzzzzz.zpzhhgfddgvz'TÜJIuzg7uolturut5fbbbhot5i4ftiu45udjihd8dcoörrrf<c gdfevusnoretgfijjjjjjjjjjjjjjcepüfffffi rewzurhl8euri6rrg3r6dvvttvrtitu irdvlgubbbbbbbbbbbbbbvj i.glituhihnhvgrrg fc gbbbibggvnbvbgjjjbpräun8888887´hkvtnnnnnrhv5h444g4thfhhhhhh
* g8rcgfftuizzzobijjzznttbohmfcuutttec g9rrrrrrr∫√ªΩzukttreeevvuvxtf6trrrrrrwwwbcu5rrrrrrrrrzubcke6rgcrx rxcccccr7wb7 vvtttttteuzvtnrnizzzztuuuunrrvvvnuilz bcrii53hv3
*
*
*
*
*
*
*
*
* q e ffjesörpäwe +w rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr+800000000
*
#vvvvvv#vvqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaawsq<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyc< d
* limitations under the License.
*/
package org.springframework.cloud.netflix.hystrix;
@@ -34,6 +22,7 @@ import java.util.List;
import org.springframework.boot.actuate.health.AbstractHealthIndicator;
import org.springframework.boot.actuate.health.Health.Builder;
import org.springframework.boot.actuate.health.HealthIndicator;
import org.springframework.boot.actuate.health.Status;
import com.netflix.hystrix.HystrixCircuitBreaker;
import com.netflix.hystrix.HystrixCommandMetrics;
@@ -47,6 +36,9 @@ import com.netflix.hystrix.HystrixCommandMetrics;
* @author Christian Dupuis
*/
public class HystrixHealthIndicator extends AbstractHealthIndicator {
/** Status code for open circuits */
private static final Status CIRCUIT_OPEN = new Status("CIRCUIT_OPEN");
@Override
protected void doHealthCheck(Builder builder) throws Exception {
@@ -63,7 +55,7 @@ public class HystrixHealthIndicator extends AbstractHealthIndicator {
// If there is at least one open circuit report OUT_OF_SERVICE adding the command group
// and key name
if (openCircuitBreakers.size() > 0) {
builder.outOfService().withDetail("openCircuitBreakers", openCircuitBreakers);
builder.status(CIRCUIT_OPEN).withDetail("openCircuitBreakers", openCircuitBreakers);
}
else {
builder.up();