Merge pull request #1044 from tyq0010/fix-#1043

Dubbo Spring Cloud support Nacos Discovery Group
pull/1050/head^2
format 5 years ago committed by GitHub
commit ad143f16e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -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(

Loading…
Cancel
Save