fix:fix system env variable read bug.

Tencent · Oct 9, 2023 · 7ad232c · 7ad232c
1 parent 6874d5e
commit 7ad232c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,4 +26,6 @@
 - fix:fix feign report -1 port bug.
 - fix:upgrade spring version.
 - fix:Update README-zh.md
-- feature: support Polaris configuration center extension plugin interface and support dynamic modification of log levels. 
+- feature: support Polaris configuration center extension plugin interface and support dynamic modification of log
+  levels.
+- fix:fix system env variable read bug.
diff --git a/pom.xml b/pom.xml
@@ -89,7 +89,7 @@
 
 	<properties>
 		<!-- Project revision -->
-		<revision>1.12.1-Hoxton.SR12</revision>
+		<revision>1.12.2-Hoxton.SR12</revision>
 
 		<!-- Spring Framework -->
 		<spring.framework.version>5.2.25.RELEASE</spring.framework.version>

diff --git a/...main/java/com/tencent/cloud/polaris/config/listener/PolarisConfigChangeEventListener.java b/...main/java/com/tencent/cloud/polaris/config/listener/PolarisConfigChangeEventListener.java
@@ -26,6 +26,8 @@
 import com.google.common.collect.Maps;
 import com.tencent.cloud.polaris.config.spring.event.ConfigChangeSpringEvent;
 import com.tencent.polaris.configuration.api.core.ConfigPropertyChangeInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.springframework.boot.context.event.ApplicationStartedEvent;
 import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
@@ -37,6 +39,7 @@
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.MutablePropertySources;
+import org.springframework.core.env.StandardEnvironment;
 import org.springframework.lang.NonNull;
 
 import static com.tencent.cloud.polaris.config.listener.PolarisConfigListenerContext.fireConfigChange;
@@ -50,6 +53,8 @@
  */
 public final class PolarisConfigChangeEventListener implements ApplicationListener<ApplicationEvent>, ApplicationEventPublisherAware {
 
+	private static final Logger LOG = LoggerFactory.getLogger(PolarisConfigChangeEventListener.class);
+
 	private static final AtomicBoolean started = new AtomicBoolean();
 
 	private ApplicationEventPublisher eventPublisher;
@@ -96,12 +101,23 @@ private Map<String, Object> loadEnvironmentProperties(ConfigurableEnvironment en
 		Map<String, Object> ret = Maps.newHashMap();
 		MutablePropertySources sources = environment.getPropertySources();
 		sources.iterator().forEachRemaining(propertySource -> {
+			// Don't read system env variable.
+			if (StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME.equals(propertySource.getName())) {
+				return;
+			}
+
 			Object o = propertySource.getSource();
 			if (o instanceof Map) {
 				for (Map.Entry<String, Object> entry : ((Map<String, Object>) o).entrySet()) {
 					String key = entry.getKey();
-					String value = environment.getProperty(key);
-					ret.put(key, value);
+					try {
+						String value = environment.getProperty(key);
+						ret.put(key, value);
+					}
+					catch (Exception e) {
+						LOG.warn("Read property from {} with key {} failed.", propertySource.getName(), key, e);
+					}
+
 				}
 			}
 			else if (o instanceof Collection) {

diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml
@@ -70,7 +70,7 @@
 	</developers>
 
 	<properties>
-		<revision>1.12.1-Hoxton.SR12</revision>
+		<revision>1.12.2-Hoxton.SR12</revision>
 
 		<!-- Dependencies -->
 		<polaris.version>1.14.1</polaris.version>