You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2018/10/24 03:04:06 UTC
[incubator-dubbo] 01/05: Change the default root directory of
zookeeper config center from '/dubbo/config' to '/dubbo'.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch dev-metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit de32524b044921be2c7087c1501c32bee9b15a73
Author: ken.lj <ke...@gmail.com>
AuthorDate: Wed Oct 24 09:42:20 2018 +0800
Change the default root directory of zookeeper config center from '/dubbo/config' to '/dubbo'.
---
.../archaius/sources/ZooKeeperConfigurationSource.java | 2 +-
.../apache/dubbo/registry/integration/RegistryProtocol.java | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/dubbo-governance/dubbo-governance-zookeeper/src/main/java/org/apache/dubbo/governance/support/archaius/sources/ZooKeeperConfigurationSource.java b/dubbo-governance/dubbo-governance-zookeeper/src/main/java/org/apache/dubbo/governance/support/archaius/sources/ZooKeeperConfigurationSource.java
index 1559572..0da40ea 100644
--- a/dubbo-governance/dubbo-governance-zookeeper/src/main/java/org/apache/dubbo/governance/support/archaius/sources/ZooKeeperConfigurationSource.java
+++ b/dubbo-governance/dubbo-governance-zookeeper/src/main/java/org/apache/dubbo/governance/support/archaius/sources/ZooKeeperConfigurationSource.java
@@ -49,7 +49,7 @@ public class ZooKeeperConfigurationSource implements WatchedConfigurationSource,
public static final String ARCHAIUS_SOURCE_ADDRESS_KEY = "archaius.zk.address";
public static final String ARCHAIUS_CONFIG_ROOT_PATH_KEY = "archaius.zk.rootpath";
public static final String ARCHAIUS_CONFIG_CHECK_KEY = "archaius.zk.check";
- public static final String DEFAULT_CONFIG_ROOT_PATH = "/dubbo/config";
+ public static final String DEFAULT_CONFIG_ROOT_PATH = "/dubbo";
private static final Logger logger = LoggerFactory.getLogger(ZooKeeperConfigurationSource.class);
private Executor executor = Executors.newFixedThreadPool(1);
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
index bdafccd..764b873 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
@@ -202,6 +202,13 @@ public class RegistryProtocol implements Protocol {
return providerUrl;
}
+ /**
+ * generate a url contains configuration items for config center.
+ * if no configuration item found, use registry url instead.
+ *
+ * @param registryUrl
+ * @return
+ */
private URL getConfigUrl(URL registryUrl) {
Map<String, String> qs = StringUtils.parseQueryString(registryUrl.getParameterAndDecoded(REFER_KEY));
URL url = registryUrl
@@ -217,6 +224,11 @@ public class RegistryProtocol implements Protocol {
if (StringUtils.isNotEmpty(configAddress)) {
url = url.setAddress(configAddress);
}
+
+ String configNamespace = registryUrl.getParameter(Constants.CONFIG_NAMESPACE_KEY);
+ if (StringUtils.isEmpty(configNamespace)) {
+ url = url.addParameter(Constants.CONFIG_NAMESPACE_KEY, registryUrl.getParameter(Constants.GROUP_KEY, Constants.DEFAULT_PROTOCOL));
+ }
return url;
}