[dubbo-go] branch develop updated: add namespaceId config for nacos
This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
The following commit(s) were added to refs/heads/develop by this push:
new 3784669 add namespaceId config for nacos
new 9697b2b Merge pull request #641 from coffeehc/develop
3784669 is described below
commit 378466946d726442c6da640936eaf2ebb3b1ba4e
Author: coffee
AuthorDate: Thu Jul 2 13:08:54 2020 +0800
add namespaceId config for nacos
---
common/constant/key.go | 1 +
registry/nacos/base_registry.go | 1 +
2 files changed, 2 insertions(+)
diff --git a/common/constant/key.go b/common/constant/key.go
index 5be63fe..8da0e89 100644
--- a/common/constant/key.go
+++ b/common/constant/key.go
@@ -150,6 +150,7 @@ const (
NACOS_CATEGORY_KEY = "category"
NACOS_PROTOCOL_KEY = "protocol"
NACOS_PATH_KEY = "path"
+ NACOS_NAMESPACE_ID = "namespaceId"
)
const (
diff --git a/registry/nacos/base_registry.go b/registry/nacos/base_registry.go
index 63f4999..f09754e 100644
--- a/registry/nacos/base_registry.go
+++ b/registry/nacos/base_registry.go
@@ -95,6 +95,7 @@ func getNacosConfig(url *common.URL) (map[string]interface{},
error) {
clientConfig.CacheDir = url.GetParam(constant.NACOS_CACHE_DIR_KEY, "")
clientConfig.LogDir = url.GetParam(constant.NACOS_LOG_DIR_KEY, "")
clientConfig.Endpoint = url.GetParam(constant.NACOS_ENDPOINT, "")
+ clientConfig.NamespaceId = url.GetParam(constant.NACOS_NAMESPACE_ID, "")
clientConfig.NotLoadCacheAtStart = true
configMap["clientConfig"] = clientConfig
[dubbo-admin] branch develop updated: change to constructor autowiring mode for MetricsCollectController.java (#622)
This is an automated email from the ASF dual-hosted git repository.
hyunkun 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 c67832e change to constructor autowiring mode for
MetricsCollectController.java (#622)
c67832e is described below
commit c67832ed8473274cebc65c00d4cbe7f0dbe41213
Author: chenlongxing112
AuthorDate: Fri Jul 3 12:43:26 2020 +0800
change to constructor autowiring mode for MetricsCollectController.java
(#622)
---
.../dubbo/admin/controller/MetricsCollectController.java | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/controller/MetricsCollectController.java
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/controller/MetricsCollectController.java
index 6acc0af..cdd129b 100644
---
a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/controller/MetricsCollectController.java
+++
b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/controller/MetricsCollectController.java
@@ -49,14 +49,16 @@ import java.util.Map;
@RequestMapping("/api/{env}/metrics")
public class MetricsCollectController {
-@Autowired
private ProviderService providerService;
-
-@Autowired
private ConsumerService consumerService;
+private MetricsService metricsService;
@Autowired
-private MetricsService metricsService;
+public MetricsCollectController(ProviderService providerService,
ConsumerService consumerService, MetricsService metricsService) {
+this.providerService = providerService;
+this.consumerService = consumerService;
+this.metricsService = metricsService;
+}
@RequestMapping(method = RequestMethod.POST)
public String metricsCollect(@RequestParam String group, @PathVariable
String env) {
[dubbo-go] branch master updated (b568e86 -> e570147)
This is an automated email from the ASF dual-hosted git repository. alexstocks pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go.git. from b568e86 Merge pull request #623 from YuzeZhang/master new 0dc83ea Add ANYHOST_KEY judgment new 9ab1a9b Update the method to clear slice new fb450a7 Simplify the assignment of override new cb18057 Update logic of ANYHOST_KEY new e570147 Merge pull request #629 from willson-chen/add_anyhost_key_judgment The 1843 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: common/constant/default.go | 1 + registry/base_configuration_listener.go | 7 ++- 2 files changed, 7 insertions(+), 1 deletion(-)
[dubbo] branch 2.6.x updated: fix #6369, Consumer cant set correct retries via generic invocation (#6370)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/2.6.x by this push:
new a9f0762 fix #6369, Consumer cant set correct retries via generic
invocation (#6370)
a9f0762 is described below
commit a9f0762f5e7a20ef7fad8ab78de0578b5ddc0b30
Author: Shadow
AuthorDate: Fri Jul 3 10:10:04 2020 +0800
fix #6369, Consumer cant set correct retries via generic invocation (#6370)
---
.../com/alibaba/dubbo/rpc/cluster/support/FailoverClusterInvoker.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailoverClusterInvoker.java
b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailoverClusterInvoker.java
index 525f3d0..de1ea9d 100644
---
a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailoverClusterInvoker.java
+++
b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailoverClusterInvoker.java
@@ -28,6 +28,7 @@ import com.alibaba.dubbo.rpc.RpcContext;
import com.alibaba.dubbo.rpc.RpcException;
import com.alibaba.dubbo.rpc.cluster.Directory;
import com.alibaba.dubbo.rpc.cluster.LoadBalance;
+import com.alibaba.dubbo.rpc.support.RpcUtils;
import java.util.ArrayList;
import java.util.HashSet;
@@ -54,7 +55,8 @@ public class FailoverClusterInvoker extends
AbstractClusterInvoker {
public Result doInvoke(Invocation invocation, final List>
invokers, LoadBalance loadbalance) throws RpcException {
List> copyinvokers = invokers;
checkInvokers(copyinvokers, invocation);
-int len = getUrl().getMethodParameter(invocation.getMethodName(),
Constants.RETRIES_KEY, Constants.DEFAULT_RETRIES) + 1;
+String methodName = RpcUtils.getMethodName(invocation);
+int len = getUrl().getMethodParameter(methodName,
Constants.RETRIES_KEY, Constants.DEFAULT_RETRIES) + 1;
if (len <= 0) {
len = 1;
}
[dubbo-go] tag v1.4.2 created (now 428fe1a)
This is an automated email from the ASF dual-hosted git repository. wongoo pushed a change to tag v1.4.2 in repository https://gitbox.apache.org/repos/asf/dubbo-go.git. at 428fe1a (commit) No new revisions were added by this update.
[dubbo] branch 2.7.x created (now 4aaaea4)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 2.7.x in repository https://gitbox.apache.org/repos/asf/dubbo.git. at 4aaaea4 2.7.8 Rlease (#6398) No new revisions were added by this update.
[dubbo] branch 2.7.8-release created (now 4aaaea4)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 2.7.8-release in repository https://gitbox.apache.org/repos/asf/dubbo.git. at 4aaaea4 2.7.8 Rlease (#6398) No new revisions were added by this update.
[dubbo] branch 2.7.8-dev updated: 2.7.8 release (#6407)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 2.7.8-dev in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/2.7.8-dev by this push: new 173df9a 2.7.8 release (#6407) 173df9a is described below commit 173df9a471b08ff0dacd6405c684b751740eeb21 Author: Mercy Ma AuthorDate: Thu Jul 2 17:08:14 2020 +0800 2.7.8 release (#6407) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert the MetadataReport * Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig publish the ServiceDefinition based on the Dubbo Event * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6310 : Refactoring MetadataReport's methods * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6315 : [Refactor] Refactoring the implementation of MetadataReport based on The Config-Center infrastructure Deprecated List : - NacosMetadataReport - ZookeeperMetadataReport * Polish apache/dubbo#6315 : Refactoring by TreePathDynamicConfiguration * Polish apache/dubbo#6315 : Refactoring ConsulDynamicConfiguration by TreePathDynamicConfiguration * Polish apache/dubbo#6315 : Reset the config base path to be "metadata" for ConfigCenterBasedMetadataReportFactory * Polish apache/dubbo#6315 : Bugfix * Polish apache/dubbo#6315 : Bugfix * Polish apache/dubbo#6315 : Correct words * sync wait netty server to finish shutdown (#6281) * Polish apache/dubbo#6333 : [Refactor] Using mandatory implementation of Service Instance registration instead of the event * maybe we can remove null judge in this case (#6321) * update * update * Polish apache/dubbo#6336 : [Refactor] org.apache.dubbo.metadata.ServiceNameMapping * Polish apache/dubbo#6170 : [Feature] Introducing the externalized configuration for ServiceNameMapping * Polish apache/dubbo#6342 : [Enhancement] Introducing the composite ServiceNameMapping * Refactor * fix method name typo in JValidator.java (#6344) * [Dubbo-6340]fix application cannot exit when use consul registry (#6341) * fix application cannot exit when use consul registry * make consul registry suppor ACL (#6313) * make consul registry suppor ACL * Polish apache/dubbo#6172 : [Feature] Adding the "services" attribute methods into @DubboReference * Polish apache/dubbo#6173 : [Feature] Adding the "services" attribute into element * Polish apache/dubbo#6346 : [Issue] Merging all subscribied URLs from the multiple services * Polish apache/dubbo#6346 : [Issue] Merging all subscribied URLs from the multiple services * fix publish null value when use consul config center (#6351) * fix publish null value when use consul config center * Polish apache/dubbo#6252 * Polish apache/dubbo#6356 & apache/dubbo#6171 * Polish apache/dubbo#6356 & apache/dubbo#6171 * Polish apache/dubbo#6224 : Filter chain was not invoked with local calls since v2.7.6 * Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases after refactoring * Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases after refactoring * Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases after refactoring * Polish apache/dubbo#6322 : Adding META-INF/dubbo/internal/org.apache.dubbo.metadata.MetadataServiceExporter * fix the priority of ListenableRouter were not effective (#6148) fixes #4822 * Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases after refactoring * when the url is generic, the log level should be info (#6363) * Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases after refactoring * Polish apache/dubbo#6322 : [Enhancement] Fix the issues
