[servicecomb-java-chassis] branch master updated: [SCB-1407] delete sensitive log (#1452)

[li...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 71f5ea2  [SCB-1407] delete sensitive log (#1452)
71f5ea2 is described below

commit 71f5ea20fbe4d0e88674a32cdaa0682e893d1fbc
Author: GuoYL <53...@users.noreply.github.com>
AuthorDate: Tue Dec 24 11:29:19 2019 +0800

    [SCB-1407] delete sensitive log (#1452)
---
 .../main/java/org/apache/servicecomb/config/ConfigUtil.java    | 10 ++++++++--
 .../servicecomb/config/archaius/sources/ConfigModel.java       |  6 ++++++
 2 files changed, 14 insertions(+), 2 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 15b1090..6be5e8d 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
@@ -21,6 +21,7 @@ import static org.apache.servicecomb.foundation.common.base.ServiceCombConstants
 import static org.apache.servicecomb.foundation.common.base.ServiceCombConstants.CONFIG_KEY_SPLITER;
 import static org.apache.servicecomb.foundation.common.base.ServiceCombConstants.CONFIG_SERVICECOMB_PREFIX;
 
+import com.netflix.config.DynamicBooleanProperty;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -33,6 +34,7 @@ import org.apache.commons.configuration.AbstractConfiguration;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.EnvironmentConfiguration;
 import org.apache.commons.configuration.SystemConfiguration;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.reflect.FieldUtils;
 import org.apache.servicecomb.config.archaius.scheduler.NeverStartPollingScheduler;
 import org.apache.servicecomb.config.archaius.sources.ConfigModel;
@@ -58,6 +60,8 @@ public final class ConfigUtil {
 
   private static final String MICROSERVICE_CONFIG_LOADER_KEY = "cse-microservice-config-loader";
 
+  private static final String IS_PRINT_URL = "servicecomb.config.log.verbose";
+
   private static Map<String, Object> localConfig = new HashMap<>();
 
   /**
@@ -116,8 +120,10 @@ public final class ConfigUtil {
     }
 
     LOGGER.info("create local config:");
-    for (ConfigModel configModel : loader.getConfigModels()) {
-      LOGGER.info(" {}.", configModel.getUrl());
+    boolean isPrintUrl = DynamicPropertyFactory.getInstance()
+        .getBooleanProperty(IS_PRINT_URL, true).get();
+    if (isPrintUrl) {
+      LOGGER.info(" {}.", StringUtils.join(loader.getConfigModels(), ","));
     }
 
     ConcurrentCompositeConfiguration config = ConfigUtil.createLocalConfig(loader.getConfigModels());
diff --git a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/archaius/sources/ConfigModel.java b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/archaius/sources/ConfigModel.java
index e9c263d..55118d5 100644
--- a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/archaius/sources/ConfigModel.java
+++ b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/archaius/sources/ConfigModel.java
@@ -21,6 +21,7 @@ import java.net.URL;
 import java.util.Map;
 
 public class ConfigModel {
+
   private URL url;
 
   private int order;
@@ -50,4 +51,9 @@ public class ConfigModel {
   public void setConfig(Map<String, Object> config) {
     this.config = config;
   }
+
+  @Override
+  public String toString() {
+    return url == null ? "" : url.toString();
+  }
 }