Cherry pick fixed.

sofastack · Sep 20, 2018 · c6c05e7 · c6c05e7
1 parent 3af0686
commit c6c05e7
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 6 deletions.
diff --git a/...ter/src/main/java/com/alipay/sofa/healthcheck/service/SofaBootReadinessCheckEndpoint.java b/...ter/src/main/java/com/alipay/sofa/healthcheck/service/SofaBootReadinessCheckEndpoint.java
@@ -52,8 +52,6 @@ public SofaBootReadinessCheckEndpoint(String id, boolean sensitive) {
     public Health invoke() {
         boolean healthCheckerStatus = readinessCheckListener.getHealthCheckerStatus();
         Map<String, Health> healthCheckerDetails = readinessCheckListener.getHealthCheckerDetails();
-
-        boolean healthIndicatorStatus = readinessCheckListener.getHealthIndicatorStatus();
         Map<String, Health> healthIndicatorDetails = readinessCheckListener
             .getHealthIndicatorDetails();
 
@@ -63,7 +61,7 @@ public Health invoke() {
 
         Builder builder;
         Map<String, Health> healths = new HashMap<>();
-        if (healthCheckerStatus && healthIndicatorStatus && afterHealthCheckCallbackStatus) {
+        if (healthCheckerStatus && afterHealthCheckCallbackStatus) {
             builder = Health.up();
         } else {
             builder = Health.down();
@@ -75,6 +73,8 @@ public Health invoke() {
             builder = builder.withDetail("ReadinessCheckCallback", afterHealthCheckCallbackDetails);
         }
         healths.put("SOFABootReadinessHealthCheckInfo", builder.build());
+
+        // HealthIndicator
         healths.putAll(healthIndicatorDetails);
         return this.healthAggregator.aggregate(healths);
     }

diff --git a/healthcheck-sofa-boot-starter/src/test/resources/logback.xml b/healthcheck-sofa-boot-starter/src/test/resources/logback.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>
+                %d{dd-MM-yyyy HH:mm:ss.SSS} %magenta([%thread]) %highlight(%-5level) %logger{36}.%M - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="info">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+</configuration>
diff --git a/...-sofa-boot-starter/src/test/java/com/alipay/sofa/infra/log/AllInfraLoggerFactoryTest.java b/...-sofa-boot-starter/src/test/java/com/alipay/sofa/infra/log/AllInfraLoggerFactoryTest.java
@@ -71,6 +71,5 @@ public void testInfoGetLogger() {
         logger2.info("test2 info ok");
 
         assertTrue(logger.isInfoEnabled());
-        assertTrue(logger.isDebugEnabled());
     }
 }
diff --git a/infra-sofa-boot-starter/src/test/resources/logback.xml b/infra-sofa-boot-starter/src/test/resources/logback.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>
+                %d{dd-MM-yyyy HH:mm:ss.SSS} %magenta([%thread]) %highlight(%-5level) %logger{36}.%M - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="info">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+</configuration>
diff --git a/isle-sofa-boot-starter/pom.xml b/isle-sofa-boot-starter/pom.xml
@@ -53,7 +53,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-test</artifactId>
+            <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/...rc/main/java/com/alipay/sofa/isle/spring/listener/SofaModuleBeanFactoryPostProcessor.java b/...rc/main/java/com/alipay/sofa/isle/spring/listener/SofaModuleBeanFactoryPostProcessor.java
@@ -24,7 +24,9 @@
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.context.annotation.ConfigurationClassPostProcessor;
 
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -54,8 +56,9 @@ private Map<String, BeanDefinition> getBeanDefinitionsForType(ConfigurableListab
         Map<String, BeanDefinition> map = new HashMap<>();
         for (Class type : types) {
             String[] beanNamesForType = beanFactory.getBeanNamesForType(type);
+            List<String> beanDefinitionNames = Arrays.asList(beanFactory.getBeanDefinitionNames());
             for (String beanName : beanNamesForType) {
-                if (notInWhiteNameList(beanName)) {
+                if (notInWhiteNameList(beanName) && beanDefinitionNames.contains(beanName)) {
                     map.put(beanName, beanFactory.getBeanDefinition(beanName));
                 }
             }

diff --git a/isle-sofa-boot-starter/src/test/resources/logback.xml b/isle-sofa-boot-starter/src/test/resources/logback.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>
+                %d{dd-MM-yyyy HH:mm:ss.SSS} %magenta([%thread]) %highlight(%-5level) %logger{36}.%M - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="info">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+</configuration>
diff --git a/runtime-sofa-boot-starter/src/test/resources/logback.xml b/runtime-sofa-boot-starter/src/test/resources/logback.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>
+                %d{dd-MM-yyyy HH:mm:ss.SSS} %magenta([%thread]) %highlight(%-5level) %logger{36}.%M - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="info">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+</configuration>