fix sofastack#385

QilongZhang · May 29, 2019 · f5198c8 · f5198c8
1 parent 2709f6d
commit f5198c8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/.../src/main/java/com/alipay/sofa/runtime/spring/health/MultiApplicationHealthIndicator.java b/.../src/main/java/com/alipay/sofa/runtime/spring/health/MultiApplicationHealthIndicator.java
@@ -33,6 +33,9 @@ public Health health() {
         boolean allPassed = true;
         Health.Builder builder = new Health.Builder();
         for (SofaRuntimeManager sofaRuntimeManager : SofaFramework.getRuntimeSet()) {
+            if (sofaRuntimeManager.getAppClassLoader().equals(this.getClass().getClassLoader())) {
+                continue;
+            }
             if (!sofaRuntimeManager.isHealthCheckPassed()) {
                 allPassed = false;
                 builder.withDetail(

diff --git a/...-sofa-boot-starter/src/test/java/com/alipay/sofa/runtime/integration/IntegrationTest.java b/...-sofa-boot-starter/src/test/java/com/alipay/sofa/runtime/integration/IntegrationTest.java
@@ -16,6 +16,7 @@
  */
 package com.alipay.sofa.runtime.integration;
 
+import com.alipay.sofa.healthcheck.startup.ReadinessCheckListener;
 import com.alipay.sofa.runtime.api.component.ComponentName;
 import com.alipay.sofa.runtime.service.binding.JvmBinding;
 import com.alipay.sofa.runtime.service.component.ReferenceComponent;
@@ -78,6 +79,9 @@ public void testHealthChecker() {
         ApplicationContext context = awareTest.getApplicationContext();
         Assert.assertNotNull(context.getBean("sofaComponentHealthChecker"));
 
+        ReadinessCheckListener readinessCheckListener = (ReadinessCheckListener)context.getBean("readinessCheckListener");
+        Assert.assertTrue(readinessCheckListener.getHealthIndicatorStatus());
+
         HealthChecker healthChecker = (HealthChecker) context.getBean("sofaComponentHealthChecker");
         Assert.assertTrue(healthChecker.isHealthy().getStatus().equals(Status.UP));
         Assert.assertEquals("SOFABoot-Components", healthChecker.getComponentName());