fix toolkit-common-logging config bug (#1178)

* raise SofaConfigSourceSupportListener order to "LoggingApplicationListener.DEFAULT_ORDER - 10" to fix toolkit-common-logging config bug * fix toolkit-common-logging config bug --------- Co-authored-by: 寻芳 <dengjialin.djl@antgroup.com>
sofastack · May 30, 2023 · 74a991d · 74a991d
1 parent 123b3eb
commit 74a991d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/...sofa-boot/src/main/java/com/alipay/sofa/boot/logging/LogEnvironmentPreparingListener.java b/...sofa-boot/src/main/java/com/alipay/sofa/boot/logging/LogEnvironmentPreparingListener.java
@@ -46,8 +46,8 @@ public void onApplicationEvent(ApplicationEnvironmentPreparedEvent event) {
 
     @Override
     public int getOrder() {
-        // Must be invoked after ConfigFileApplicationListener
-        return Ordered.HIGHEST_PRECEDENCE + 20;
+        // Must be invoked after ConfigFileApplicationListener, and before SofaConfigSourceSupportListener
+        return Ordered.HIGHEST_PRECEDENCE + 12;
     }
 
     private void prepare(ConfigurableEnvironment environment) {

diff --git a/...ofa-boot/src/main/java/com/alipay/sofa/boot/listener/SofaConfigSourceSupportListener.java b/...ofa-boot/src/main/java/com/alipay/sofa/boot/listener/SofaConfigSourceSupportListener.java
@@ -19,6 +19,7 @@
 import com.alipay.sofa.common.config.SofaConfigs;
 import com.alipay.sofa.common.config.source.AbstractConfigSource;
 import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
+import org.springframework.boot.context.logging.LoggingApplicationListener;
 import org.springframework.context.ApplicationListener;
 import org.springframework.core.Ordered;
 import org.springframework.core.env.ConfigurableEnvironment;
@@ -33,7 +34,7 @@ public class SofaConfigSourceSupportListener
                                             implements
                                             ApplicationListener<ApplicationEnvironmentPreparedEvent>,
                                             Ordered {
-    private static final int SOFA_BOOT_CONFIG_SOURCE_ORDER = LOWEST_PRECEDENCE;
+    private static final int SOFA_BOOT_CONFIG_SOURCE_ORDER = LoggingApplicationListener.DEFAULT_ORDER - 5;
 
     @Override
     public void onApplicationEvent(ApplicationEnvironmentPreparedEvent event) {
@@ -63,6 +64,6 @@ public boolean hasKey(String key) {
 
     @Override
     public int getOrder() {
-        return LOWEST_PRECEDENCE;
+        return LoggingApplicationListener.DEFAULT_ORDER - 5;
     }
 }