[2022.x] Fix nacos discovery/config log (#3133) (#3160) (#3166)

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/logging/NacosLoggingAppRunListener.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2013-2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.alibaba.cloud.nacos.logging;
+
+import com.alibaba.nacos.client.logging.NacosLogging;
+
+import org.springframework.boot.ConfigurableBootstrapContext;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.SpringApplicationRunListener;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.Ordered;
+import org.springframework.core.env.ConfigurableEnvironment;
+
+/**
+ * Reload nacos log configuration on spring application contextPrepared.
+ *
+ * @author RuanSheng
+ */
+public class NacosLoggingAppRunListener implements SpringApplicationRunListener, Ordered {
+
+	public NacosLoggingAppRunListener(SpringApplication application, String[] args) {
+
+	}
+
+	@Override
+	public void environmentPrepared(ConfigurableBootstrapContext bootstrapContext, ConfigurableEnvironment environment) {
+		NacosLogging.getInstance().loadConfiguration();
+	}
+
+	@Override
+	public void contextPrepared(ConfigurableApplicationContext context) {
+		NacosLogging.getInstance().loadConfiguration();
+	}
+
+	@Override
+	public int getOrder() {
+		return 1;
+	}
+
+}

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/logging/NacosLoggingListener.java

@@ -30,6 +30,7 @@
  *
  * @author mai.jh
  */
+@Deprecated
 public class NacosLoggingListener implements GenericApplicationListener {
 
 	@Override

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/resources/META-INF/spring.factories

@@ -6,8 +6,8 @@ com.alibaba.cloud.nacos.configdata.NacosConfigDataMissingEnvironmentPostProcesso
 org.springframework.boot.env.PropertySourceLoader=\
 com.alibaba.cloud.nacos.parser.NacosJsonPropertySourceLoader,\
 com.alibaba.cloud.nacos.parser.NacosXmlPropertySourceLoader
-org.springframework.context.ApplicationListener=\
-com.alibaba.cloud.nacos.logging.NacosLoggingListener
+org.springframework.boot.SpringApplicationRunListener=\
+com.alibaba.cloud.nacos.logging.NacosLoggingAppRunListener
 org.springframework.boot.env.EnvironmentPostProcessor=\
 com.alibaba.cloud.nacos.configdata.NacosConfigDataMissingEnvironmentPostProcessor
 

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/logging/NacosLoggingListener.java

@@ -30,6 +30,7 @@
  *
  * @author mai.jh
  */
+@Deprecated
 public class NacosLoggingListener implements GenericApplicationListener {
 
 	@Override

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/logging/NacosLoggingAppRunListener.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2013-2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.alibaba.cloud.nacos.logging;
+
+import com.alibaba.nacos.client.logging.NacosLogging;
+
+import org.springframework.boot.ConfigurableBootstrapContext;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.SpringApplicationRunListener;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.Ordered;
+import org.springframework.core.env.ConfigurableEnvironment;
+
+/**
+ * Reload nacos log configuration on spring application contextPrepared.
+ *
+ * @author RuanSheng
+ */
+public class NacosLoggingAppRunListener implements SpringApplicationRunListener, Ordered {
+
+	public NacosLoggingAppRunListener(SpringApplication application, String[] args) {
+
+	}
+
+	@Override
+	public void environmentPrepared(ConfigurableBootstrapContext bootstrapContext, ConfigurableEnvironment environment) {
+		NacosLogging.getInstance().loadConfiguration();
+	}
+
+	@Override
+	public void contextPrepared(ConfigurableApplicationContext context) {
+		NacosLogging.getInstance().loadConfiguration();
+	}
+
+	@Override
+	public int getOrder() {
+		return 1;
+	}
+
+}

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/resources/META-INF/spring.factories

@@ -1,4 +1,4 @@
 org.springframework.cloud.bootstrap.BootstrapConfiguration=\
   com.alibaba.cloud.nacos.discovery.configclient.NacosDiscoveryClientConfigServiceBootstrapConfiguration
-org.springframework.context.ApplicationListener=\
-  com.alibaba.cloud.nacos.discovery.logging.NacosLoggingListener
+org.springframework.boot.SpringApplicationRunListener=\
+  com.alibaba.cloud.nacos.logging.NacosLoggingAppRunListener