This is an automated email from the ASF dual-hosted git repository. wujimin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit de94e02128bcb3c977aa18151d462b87900f9733 Author: zhengyangyong <[email protected]> AuthorDate: Thu Jan 4 19:26:38 2018 +0800 SCB-166 fix bug Signed-off-by: zhengyangyong <[email protected]> --- .../core/health/DefaultMicroserviceHealthChecker.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/health/DefaultMicroserviceHealthChecker.java b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/health/DefaultMicroserviceHealthChecker.java index 6a0945e..f4fe4c1 100644 --- a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/health/DefaultMicroserviceHealthChecker.java +++ b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/health/DefaultMicroserviceHealthChecker.java @@ -17,9 +17,9 @@ package io.servicecomb.metrics.core.health; -import com.fasterxml.jackson.core.JsonProcessingException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import io.servicecomb.foundation.common.exceptions.ServiceCombException; import io.servicecomb.foundation.common.utils.JsonUtils; import io.servicecomb.metrics.common.DefaultHealthCheckExtraData; import io.servicecomb.metrics.common.HealthCheckResult; @@ -30,6 +30,8 @@ import io.servicecomb.serviceregistry.api.registry.MicroserviceInstance; public class DefaultMicroserviceHealthChecker implements HealthChecker { + private static Logger logger = LoggerFactory.getLogger(DefaultMicroserviceHealthChecker.class); + @Override public String getName() { return "default"; @@ -42,10 +44,6 @@ public class DefaultMicroserviceHealthChecker implements HealthChecker { private String getExtraData() { try { - if (RegistryUtils.getServiceRegistry() == null) { - RegistryUtils.init(); - } - Microservice microservice = RegistryUtils.getMicroservice(); MicroserviceInstance instance = RegistryUtils.getMicroserviceInstance(); return JsonUtils.writeValueAsString(new DefaultHealthCheckExtraData( @@ -55,8 +53,10 @@ public class DefaultMicroserviceHealthChecker implements HealthChecker { microservice.getServiceName(), microservice.getVersion(), String.join(",", instance.getEndpoints()))); - } catch (JsonProcessingException e) { - throw new ServiceCombException("unable load microservice info for healthchecker", e); + } catch (Exception e) { + String error = "unable load microservice info from RegistryUtils"; + logger.error(error, e); + return error; } } } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
