You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by mi...@apache.org on 2019/06/27 02:34:16 UTC
[dubbo-admin] branch develop updated: seperate groups
This is an automated email from the ASF dual-hosted git repository.
min pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git
The following commit(s) were added to refs/heads/develop by this push:
new 39c5cee seperate groups
39c5cee is described below
commit 39c5ceeeb96fc1abf55baadf19564e2bf05678f8
Author: nzomkxia <z8...@gmail.com>
AuthorDate: Thu Jun 27 10:34:32 2019 +0800
seperate groups
---
.../apache/dubbo/admin/config/ConfigCenter.java | 22 ++++++++++++++--------
.../src/main/resources/application.properties | 6 ++++--
2 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java
index 3513cd8..2879559 100644
--- a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java
+++ b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java
@@ -52,8 +52,14 @@ public class ConfigCenter {
@Value("${admin.metadata-report.address:}")
private String metadataAddress;
- @Value("${admin.registry.group:}")
- private String group;
+ @Value("${admin.registry.group:dubbo}")
+ private String registryGroup;
+
+ @Value("${admin.config-center.group:dubbo}")
+ private String configCenterGroup;
+
+ @Value("${admin.metadata-report.group:dubbo}")
+ private String metadataGroup;
@Value("${admin.config-center.username:}")
private String username;
@@ -76,7 +82,7 @@ public class ConfigCenter {
GovernanceConfiguration dynamicConfiguration = null;
if (StringUtils.isNotEmpty(configCenter)) {
- configCenterUrl = formUrl(configCenter, group, username, password);
+ configCenterUrl = formUrl(configCenter, configCenterGroup, username, password);
dynamicConfiguration = ExtensionLoader.getExtensionLoader(GovernanceConfiguration.class).getExtension(configCenterUrl.getProtocol());
dynamicConfiguration.setUrl(configCenterUrl);
dynamicConfiguration.init();
@@ -86,16 +92,16 @@ public class ConfigCenter {
Arrays.stream(config.split("\n")).forEach( s -> {
if(s.startsWith(Constants.REGISTRY_ADDRESS)) {
String registryAddress = s.split("=")[1].trim();
- registryUrl = formUrl(registryAddress, group, username, password);
+ registryUrl = formUrl(registryAddress, configCenterGroup, username, password);
} else if (s.startsWith(Constants.METADATA_ADDRESS)) {
- metadataUrl = formUrl(s.split("=")[1].trim(), group, username, password);
+ metadataUrl = formUrl(s.split("=")[1].trim(), configCenterGroup, username, password);
}
});
}
}
if (dynamicConfiguration == null) {
if (StringUtils.isNotEmpty(registryAddress)) {
- registryUrl = formUrl(registryAddress, group, username, password);
+ registryUrl = formUrl(registryAddress, configCenterGroup, username, password);
dynamicConfiguration = ExtensionLoader.getExtensionLoader(GovernanceConfiguration.class).getExtension(registryUrl.getProtocol());
dynamicConfiguration.setUrl(registryUrl);
dynamicConfiguration.init();
@@ -119,7 +125,7 @@ public class ConfigCenter {
if (StringUtils.isBlank(registryAddress)) {
throw new ConfigurationException("Either config center or registry address is needed, please refer to https://github.com/apache/incubator-dubbo-admin/wiki/Dubbo-Admin-configuration");
}
- registryUrl = formUrl(registryAddress, group, username, password);
+ registryUrl = formUrl(registryAddress, registryGroup, username, password);
}
RegistryFactory registryFactory = ExtensionLoader.getExtensionLoader(RegistryFactory.class).getAdaptiveExtension();
registry = registryFactory.getRegistry(registryUrl);
@@ -135,7 +141,7 @@ public class ConfigCenter {
MetaDataCollector metaDataCollector = new NoOpMetadataCollector();
if (metadataUrl == null) {
if (StringUtils.isNotEmpty(metadataAddress)) {
- metadataUrl = formUrl(metadataAddress, group, username, password);
+ metadataUrl = formUrl(metadataAddress, metadataGroup, username, password);
}
}
if (metadataUrl != null) {
diff --git a/dubbo-admin-server/src/main/resources/application.properties b/dubbo-admin-server/src/main/resources/application.properties
index 204abe3..056946d 100644
--- a/dubbo-admin-server/src/main/resources/application.properties
+++ b/dubbo-admin-server/src/main/resources/application.properties
@@ -20,9 +20,11 @@ admin.registry.address=zookeeper://127.0.0.1:2181
admin.config-center=zookeeper://127.0.0.1:2181
admin.metadata-report.address=zookeeper://127.0.0.1:2181
-
-
+#group
admin.registry.group=dubbo
+admin.config-center.group=dubbo
+admin.metadata-report.group=dubbo
+
admin.apollo.token=e16e5cd903fd0c97a116c873b448544b9d086de9
admin.apollo.appId=test
admin.apollo.env=dev