Commit ee499b02 authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '1.5.x'

parents 7f18b3d8 5e35cdcc
...@@ -16,6 +16,9 @@ ...@@ -16,6 +16,9 @@
package org.springframework.boot.actuate.health; package org.springframework.boot.actuate.health;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.boot.actuate.health.Health.Builder; import org.springframework.boot.actuate.health.Health.Builder;
/** /**
...@@ -31,6 +34,8 @@ import org.springframework.boot.actuate.health.Health.Builder; ...@@ -31,6 +34,8 @@ import org.springframework.boot.actuate.health.Health.Builder;
*/ */
public abstract class AbstractHealthIndicator implements HealthIndicator { public abstract class AbstractHealthIndicator implements HealthIndicator {
private final Log logger = LogFactory.getLog(getClass());
@Override @Override
public final Health health() { public final Health health() {
Health.Builder builder = new Health.Builder(); Health.Builder builder = new Health.Builder();
...@@ -38,6 +43,7 @@ public abstract class AbstractHealthIndicator implements HealthIndicator { ...@@ -38,6 +43,7 @@ public abstract class AbstractHealthIndicator implements HealthIndicator {
doHealthCheck(builder); doHealthCheck(builder);
} }
catch (Exception ex) { catch (Exception ex) {
this.logger.warn("Health check failed", ex);
builder.down(ex); builder.down(ex);
} }
return builder.build(); return builder.build();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment