You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2018/07/19 09:33:11 UTC

[incubator-servicecomb-java-chassis] branch master updated (082b0dc -> 767d4a0)

This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git.


    from 082b0dc  [SCB-729] instance cache check task can be trigger periodically or manually
     new fbc2981  优化日志，不在重复拷贝 本地配置文件中的 cse 配置
     new 767d4a0  do not duplicate copy cse config to serviceComb config when create local config

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/java/org/apache/servicecomb/config/ConfigUtil.java      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

[incubator-servicecomb-java-chassis] 01/02: 优化日志，不在重复拷贝 本地配置文件中的 cse 配置

Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git

commit fbc2981b48d8daeeb36aa3a4117f0ae36c2dbb57
Author: heyile <he...@huawei.com>
AuthorDate: Wed Jul 18 18:01:08 2018 +0800

    优化日志，不在重复拷贝 本地配置文件中的 cse 配置
---
 .../src/main/java/org/apache/servicecomb/config/ConfigUtil.java      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 0ec8332..0a0cf16 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
@@ -185,8 +185,11 @@ public final class ConfigUtil {
   private static void duplicateCseConfigToServicecomb(ConcurrentCompositeConfiguration compositeConfiguration,
       AbstractConfiguration source,
       String sourceName) {
-    duplicateCseConfigToServicecomb(source);
 
+    //do not duplicate copy cse config to serviceComb config
+    if (!"configFromYamlFile".equals(sourceName)) {
+      duplicateCseConfigToServicecomb(source);
+    }
     compositeConfiguration.addConfiguration(source, sourceName);
   }

[incubator-servicecomb-java-chassis] 02/02: do not duplicate copy cse config to serviceComb config when create local config

Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git

commit 767d4a0c8ec1a0b41b2283df76abaf39dad1c089
Author: heyile <he...@huawei.com>
AuthorDate: Thu Jul 19 09:30:06 2018 +0800

    do not duplicate copy cse config to serviceComb config when create local config
---
 .../main/java/org/apache/servicecomb/config/ConfigUtil.java    | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

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 0a0cf16..fd549b5 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
@@ -137,8 +137,9 @@ public final class ConfigUtil {
         .forEachOrdered(configMapEntry -> duplicateCseConfigToServicecomb(config,
             new ConcurrentMapConfiguration(configMapEntry.getValue()),
             configMapEntry.getKey()));
-    duplicateCseConfigToServicecomb(config,
-        new DynamicConfiguration(
+    // we have already copy the cse config to the serviceComb config when we load the config from local yaml files
+    // hence, we do not need duplicate copy it.
+    config.addConfiguration( new DynamicConfiguration(
             new MicroserviceConfigurationSource(configModelList), new NeverStartPollingScheduler()),
         "configFromYamlFile");
     duplicateCseConfigToServicecombAtFront(config,
@@ -185,11 +186,8 @@ public final class ConfigUtil {
   private static void duplicateCseConfigToServicecomb(ConcurrentCompositeConfiguration compositeConfiguration,
       AbstractConfiguration source,
       String sourceName) {
+    duplicateCseConfigToServicecomb(source);
 
-    //do not duplicate copy cse config to serviceComb config
-    if (!"configFromYamlFile".equals(sourceName)) {
-      duplicateCseConfigToServicecomb(source);
-    }
     compositeConfiguration.addConfiguration(source, sourceName);
   }