Merge pull request #210 from dubbo-x/url

Imp: skip subscribe on provider side when using consul

common/constant/env.go

@@ -18,7 +18,7 @@
 package constant
 
 const (
-	CONF_CONSUMER_FILE_PATH        = "CONF_CONSUMER_FILE_PATH"
-	CONF_PROVIDER_FILE_PATH        = "CONF_PROVIDER_FILE_PATH"
-	APP_LOG_CONF_FILE       string = "APP_LOG_CONF_FILE"
+	CONF_CONSUMER_FILE_PATH = "CONF_CONSUMER_FILE_PATH"
+	CONF_PROVIDER_FILE_PATH = "CONF_PROVIDER_FILE_PATH"
+	APP_LOG_CONF_FILE       = "APP_LOG_CONF_FILE"
 )

config/config_loader.go

@@ -54,6 +54,7 @@ func init() {
 		providerConfig = nil
 	}
 }
+
 func checkRegistries(registries map[string]*RegistryConfig, singleRegistry *RegistryConfig) {
 	if len(registries) == 0 && singleRegistry != nil {
 		registries[constant.DEFAULT_KEY] = singleRegistry

registry/consul/registry.go

@@ -111,31 +111,21 @@ func (r *consulRegistry) unregister(url common.URL) error {
 	return r.client.Agent().ServiceDeregister(buildId(url))
 }
 
-func (r *consulRegistry) subscribe(url *common.URL) (registry.Listener, error) {
-	var (
-		listener registry.Listener
-		err      error
-	)
-
+func (r *consulRegistry) Subscribe(url *common.URL, notifyListener registry.NotifyListener) {
 	role, _ := strconv.Atoi(r.URL.GetParam(constant.ROLE_KEY, ""))
 	if role == common.CONSUMER {
-		listener, err = r.getListener(*url)
-		if err != nil {
-			return nil, err
-		}
+		r.subscribe(url, notifyListener)
 	}
-	return listener, nil
 }
 
-//subscibe from registry
-func (r *consulRegistry) Subscribe(url *common.URL, notifyListener registry.NotifyListener) {
+func (r *consulRegistry) subscribe(url *common.URL, notifyListener registry.NotifyListener) {
 	for {
 		if !r.IsAvailable() {
 			logger.Warnf("event listener game over.")
 			return
 		}
 
-		listener, err := r.subscribe(url)
+		listener, err := r.getListener(*url)
 		if err != nil {
 			if !r.IsAvailable() {
 				logger.Warnf("event listener game over.")
@@ -155,9 +145,7 @@ func (r *consulRegistry) Subscribe(url *common.URL, notifyListener registry.Noti
 				logger.Infof("update begin, service event: %v", serviceEvent.String())
 				notifyListener.Notify(serviceEvent)
 			}
-
 		}
-
 	}
 }
 

registry/consul/registry_test.go

@@ -51,7 +51,7 @@ func (suite *consulRegistryTestSuite) testUnregister() {
 func (suite *consulRegistryTestSuite) testSubscribe() {
 	consumerUrl := newConsumerUrl(consumerHost, consumerPort, service, protocol)
 	suite.consumerUrl = consumerUrl
-	listener, err := suite.consumerRegistry.subscribe(&consumerUrl)
+	listener, err := suite.consumerRegistry.getListener(consumerUrl)
 	assert.NoError(suite.t, err)
 	suite.listener = listener
 }

registry/directory/directory.go

@@ -40,10 +40,6 @@ import (
 	"github.com/apache/dubbo-go/registry"
 )
 
-const (
-	RegistryConnDelay = 3
-)
-
 type Options struct {
 	serviceTTL time.Duration
 }
@@ -87,7 +83,7 @@ func NewRegistryDirectory(url *common.URL, registry registry.Registry, opts ...O
 	return dir, nil
 }
 
-//subscibe from registry
+//subscribe from registry
 func (dir *registryDirectory) Subscribe(url *common.URL) {
 	dir.consumerConfigurationListener.addNotifyListener(dir)
 	dir.referenceConfigurationListener = newReferenceConfigurationListener(dir, url)
@@ -245,6 +241,7 @@ func (dir *registryDirectory) Destroy() {
 		dir.cacheInvokers = []protocol.Invoker{}
 	})
 }
+
 func (dir *registryDirectory) overrideUrl(targetUrl *common.URL) {
 	doOverrideUrl(dir.configurators, targetUrl)
 	doOverrideUrl(dir.consumerConfigurationListener.Configurators(), targetUrl)
@@ -293,9 +290,11 @@ func newConsumerConfigurationListener(dir *registryDirectory) *consumerConfigura
 	)
 	return listener
 }
+
 func (l *consumerConfigurationListener) addNotifyListener(listener registry.NotifyListener) {
 	l.listeners = append(l.listeners, listener)
 }
+
 func (l *consumerConfigurationListener) Process(event *config_center.ConfigChangeEvent) {
 	l.BaseConfigurationListener.Process(event)
 	l.directory.refreshInvokers(nil)

registry/etcdv3/registry.go

@@ -330,7 +330,7 @@ func (r *etcdV3Registry) subscribe(svc *common.URL) (registry.Listener, error) {
 	return configListener, nil
 }
 
-//subscibe from registry
+//subscribe from registry
 func (r *etcdV3Registry) Subscribe(url *common.URL, notifyListener registry.NotifyListener) {
 	for {
 		if !r.IsAvailable() {

registry/nacos/registry.go

@@ -172,17 +172,17 @@ func (nr *nacosRegistry) subscribe(conf *common.URL) (registry.Listener, error)
 	return NewNacosListener(*conf, nr.namingClient)
 }
 
-//subscibe from registry
-func (r *nacosRegistry) Subscribe(url *common.URL, notifyListener registry.NotifyListener) {
+//subscribe from registry
+func (nr *nacosRegistry) Subscribe(url *common.URL, notifyListener registry.NotifyListener) {
 	for {
-		if !r.IsAvailable() {
+		if !nr.IsAvailable() {
 			logger.Warnf("event listener game over.")
 			return
 		}
 
-		listener, err := r.subscribe(url)
+		listener, err := nr.subscribe(url)
 		if err != nil {
-			if !r.IsAvailable() {
+			if !nr.IsAvailable() {
 				logger.Warnf("event listener game over.")
 				return
 			}
@@ -205,6 +205,7 @@ func (r *nacosRegistry) Subscribe(url *common.URL, notifyListener registry.Notif
 
 	}
 }
+
 func (nr *nacosRegistry) GetUrl() common.URL {
 	return *nr.URL
 }

registry/zookeeper/registry.go

@@ -147,6 +147,7 @@ func newMockZkRegistry(url *common.URL, opts ...zookeeper.Option) (*zk.TestClust
 
 	return c, r, nil
 }
+
 func (r *zkRegistry) ZkClient() *zookeeper.ZookeeperClient {
 	return r.client
 }
@@ -399,7 +400,7 @@ func (r *zkRegistry) subscribe(conf *common.URL) (registry.Listener, error) {
 	return r.getListener(conf)
 }
 
-//subscibe from registry
+//subscribe from registry
 func (r *zkRegistry) Subscribe(url *common.URL, notifyListener registry.NotifyListener) {
 	for {
 		if !r.IsAvailable() {
@@ -432,6 +433,7 @@ func (r *zkRegistry) Subscribe(url *common.URL, notifyListener registry.NotifyLi
 
 	}
 }
+
 func (r *zkRegistry) getListener(conf *common.URL) (*RegistryConfigurationListener, error) {
 	var (
 		zkListener *RegistryConfigurationListener