[GitHub] DogRex closed pull request #763: Allow installing additional dynamic configurations

[GitBox <gi...@apache.org>]

DogRex closed pull request #763: Allow installing additional dynamic configurations
URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/763
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigUtil.java b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigUtil.java
index 27f216101..c91cd6723 100644
--- a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigUtil.java
+++ b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigUtil.java
@@ -27,6 +27,7 @@
 import java.util.List;
 import java.util.Map;
 
+import com.netflix.config.*;
 import org.apache.commons.configuration.AbstractConfiguration;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.EnvironmentConfiguration;
@@ -40,15 +41,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.netflix.config.ConcurrentCompositeConfiguration;
-import com.netflix.config.ConcurrentMapConfiguration;
-import com.netflix.config.ConfigurationManager;
-import com.netflix.config.DynamicConfiguration;
-import com.netflix.config.DynamicPropertyFactory;
-import com.netflix.config.DynamicWatchedConfiguration;
-import com.netflix.config.WatchedUpdateListener;
-import com.netflix.config.WatchedUpdateResult;
-
 public final class ConfigUtil {
   private static final Logger LOGGER = LoggerFactory.getLogger(ConfigUtil.class);
 
@@ -222,11 +214,6 @@ public static AbstractConfiguration createDynamicConfig() {
   }
 
   public static void installDynamicConfig() {
-    if (ConfigurationManager.isConfigurationInstalled()) {
-      LOGGER.warn("Configuration installed by others, will ignore this configuration.");
-      return;
-    }
-
     ConcurrentCompositeConfiguration compositeConfig = ConfigUtil.createLocalConfig();
     ConfigCenterConfigurationSource configCenterConfigurationSource =
         createConfigCenterConfigurationSource(compositeConfig);
@@ -234,7 +221,19 @@ public static void installDynamicConfig() {
       createDynamicWatchedConfiguration(compositeConfig, configCenterConfigurationSource);
     }
 
-    ConfigurationManager.install(compositeConfig);
+    if (ConfigurationManager.isConfigurationInstalled()) {
+        AbstractConfiguration installedConfiguration = ConfigurationManager.getConfigInstance();
+        if(installedConfiguration instanceof AggregatedConfiguration) {
+            ((AggregatedConfiguration)installedConfiguration).addConfiguration(compositeConfig);
+        }
+        else {
+            LOGGER.warn("Configuration installed by others, will ignore this configuration.");
+            return;
+        }
+    }
+    else {
+        ConfigurationManager.install(compositeConfig);
+    }
 
     if (configCenterConfigurationSource != null) {
       configCenterConfigurationSource.init(compositeConfig);
diff --git a/foundations/foundation-config/src/test/java/org/apache/servicecomb/config/TestConfigUtil.java b/foundations/foundation-config/src/test/java/org/apache/servicecomb/config/TestConfigUtil.java
index c56bb7deb..75373983d 100644
--- a/foundations/foundation-config/src/test/java/org/apache/servicecomb/config/TestConfigUtil.java
+++ b/foundations/foundation-config/src/test/java/org/apache/servicecomb/config/TestConfigUtil.java
@@ -30,7 +30,9 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import com.netflix.config.*;
 import org.apache.commons.configuration.AbstractConfiguration;
+import org.apache.commons.configuration.MapConfiguration;
 import org.apache.servicecomb.config.archaius.sources.ConfigModel;
 import org.apache.servicecomb.config.archaius.sources.MicroserviceConfigLoader;
 import org.apache.servicecomb.config.spi.ConfigCenterConfigurationSource;
@@ -42,11 +44,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.netflix.config.ConcurrentCompositeConfiguration;
-import com.netflix.config.DynamicConfiguration;
-import com.netflix.config.DynamicPropertyFactory;
-import com.netflix.config.DynamicWatchedConfiguration;
-
 import mockit.Deencapsulation;
 import mockit.Expectations;
 import mockit.Mock;
@@ -75,6 +72,14 @@ public static void beforeTest() {
       throw new IllegalStateException(e);
     }
 
+    //support install with other configuration
+    ConcurrentCompositeConfiguration compositeConfiguration = new ConcurrentCompositeConfiguration();
+    Map<String,Object> props = new HashMap<>();
+    props.put("other_config.key1", "other_config.value1");
+    props.put("cse.cse.servicecomb.file", "valueToOverride");
+    compositeConfiguration.addConfiguration(new MapConfiguration(props));
+    ConfigurationManager.install(compositeConfiguration);
+
     ConfigUtil.installDynamicConfig();
   }
 
@@ -83,6 +88,15 @@ public static void tearDown() {
     ArchaiusUtils.resetConfig();
   }
 
+  @Test
+  public void testGetOtherConfiguration()
+  {
+    Assert.assertEquals("other_config.value1",
+            DynamicPropertyFactory.getInstance().getStringProperty("other_config.key1",null));
+    Assert.assertEquals("value",
+            DynamicPropertyFactory.getInstance().getStringProperty("cse.cse.servicecomb.file",null));
+  }
+
   @Test
   public void testAddConfig() {
     Map<String, Object> config = new HashMap<>();


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services