study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

Update DubboServiceDiscoveryAutoConfiguration.java

Browse Source 
fix (DubboServiceDiscoveryAutoConfiguration does not set the group when subscribing to service #1043)
This commit is contained in:
tyq0010 2019-11-05 21:31:39 +08:00 committed by GitHub
parent b64337f00c
commit b2825b275f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceDiscoveryAutoConfiguration.java
View File

@ -505,14 +505,16 @@ public class DubboServiceDiscoveryAutoConfiguration {
class NacosConfiguration { class NacosConfiguration {
private final NamingService namingService; private final NamingService namingService;
private final NacosDiscoveryProperties nacosDiscoveryProperties;
/** /**
* the set of services is listening. * the set of services is listening.
*/ */
private final Set<String> listeningServices; private final Set<String> listeningServices;
NacosConfiguration(NacosNamingManager nacosNamingManager) { NacosConfiguration(NacosNamingManager nacosNamingManager, NacosDiscoveryProperties nacosDiscoveryProperties) {
this.namingService = nacosNamingManager.getNamingService(); this.namingService = nacosNamingManager.getNamingService();
this.nacosDiscoveryProperties = nacosDiscoveryProperties;
this.listeningServices = new ConcurrentSkipListSet<>(); this.listeningServices = new ConcurrentSkipListSet<>();
} }
@ -537,7 +539,8 @@ public class DubboServiceDiscoveryAutoConfiguration {
private void subscribeEventListener(String serviceName) { private void subscribeEventListener(String serviceName) {
if (listeningServices.add(serviceName)) { if (listeningServices.add(serviceName)) {
try { try {
namingService.subscribe(serviceName, event -> { String group = nacosDiscoveryProperties.getGroup();
namingService.subscribe(serviceName, group, event -> {
if (event instanceof NamingEvent) { if (event instanceof NamingEvent) {
NamingEvent namingEvent = (NamingEvent) event; NamingEvent namingEvent = (NamingEvent) event;
List<ServiceInstance> serviceInstances = hostToServiceInstanceList( List<ServiceInstance> serviceInstances = hostToServiceInstanceList(