diff --git a/registry/consul/service_discovery.go b/registry/consul/service_discovery.go index d2e65be8822d4d48055835713d9c1aae32ff443f..662b2bca0b5a47abfb59dc2a8363e0f3d6673c7e 100644 --- a/registry/consul/service_discovery.go +++ b/registry/consul/service_discovery.go @@ -136,7 +136,7 @@ type consulServiceDiscovery struct { *consul.Config } -func (csd *consulServiceDiscovery) Initialize(registryURL common.URL) error { +func (csd *consulServiceDiscovery) Init(registryURL common.URL) error { csd.serviceUrl = registryURL csd.checkPassInterval = registryURL.GetParamInt(CHECK_PASS_INTERVAL, DEFAULT_CHECK_PASS_INTERVAL) csd.tag = registryURL.GetParam(QUERY_TAG, "") diff --git a/registry/consul/service_discovery_test.go b/registry/consul/service_discovery_test.go index ec85d4aa9c36432fed1c3972cf59a366a284dd06..19e2a3df0ddaa0caa5f0fea63f03195a7e343a51 100644 --- a/registry/consul/service_discovery_test.go +++ b/registry/consul/service_discovery_test.go @@ -81,7 +81,7 @@ func TestConsulServiceDiscovery_Destroy(t *testing.T) { prepareData() serviceDiscovery, err := extension.GetServiceDiscovery(constant.CONSUL_KEY, testName) _, registryUrl := prepareService() - serviceDiscovery.Initialize(registryUrl) + serviceDiscovery.Init(registryUrl) assert.Nil(t, err) assert.NotNil(t, serviceDiscovery) err = serviceDiscovery.Destroy() @@ -109,7 +109,7 @@ func TestConsulServiceDiscovery_CRUD(t *testing.T) { serviceDiscovery, err := extension.GetServiceDiscovery(constant.CONSUL_KEY, testName) assert.Nil(t, err) - err = serviceDiscovery.Initialize(registryUrl) + err = serviceDiscovery.Init(registryUrl) assert.Nil(t, err) err = serviceDiscovery.Unregister(instance) diff --git a/registry/etcdv3/service_discovery.go b/registry/etcdv3/service_discovery.go index 010adff594d45cc219cc44ca44a456c43c0f8e82..6a99a392263e5d7808c2c9b7d42e59024640a973 100644 --- a/registry/etcdv3/service_discovery.go +++ b/registry/etcdv3/service_discovery.go @@ -67,7 +67,7 @@ type etcdV3ServiceDiscovery struct { childListenerMap map[string]*etcdv3.EventListener } -func (e *etcdV3ServiceDiscovery) Initialize(registryURL common.URL) error { +func (e *etcdV3ServiceDiscovery) Init(registryURL common.URL) error { return nil } diff --git a/registry/event/event_publishing_service_deiscovery_test.go b/registry/event/event_publishing_service_deiscovery_test.go index 0f10536968f5adc7d7db452d3611a70534964b05..2b4bf05f1df8fb455afb031e21ae2c3c319e6cd4 100644 --- a/registry/event/event_publishing_service_deiscovery_test.go +++ b/registry/event/event_publishing_service_deiscovery_test.go @@ -117,7 +117,7 @@ func (tel *TestServiceInstancePreRegisteredEventListener) GetEventType() reflect type ServiceDiscoveryA struct { } -func (msd *ServiceDiscoveryA) Initialize(registryURL common.URL) error { +func (msd *ServiceDiscoveryA) Init(registryURL common.URL) error { return nil } diff --git a/registry/event/event_publishing_service_discovery.go b/registry/event/event_publishing_service_discovery.go index 5742a18f20f73c208e46f7557e44cf7918addd70..14ee18997f65507c6c69b2021ac3b8c43ea10c5e 100644 --- a/registry/event/event_publishing_service_discovery.go +++ b/registry/event/event_publishing_service_discovery.go @@ -38,8 +38,8 @@ import ( // EventPublishingServiceDiscovery will enhance Service Discovery // Publish some event about service discovery type EventPublishingServiceDiscovery struct { - serviceDiscovery registry.ServiceDiscovery - once sync.Once + serviceDiscovery registry.ServiceDiscovery + serviceDiscoveryInitOnce sync.Once } // NewEventPublishingServiceDiscovery is a constructor @@ -54,10 +54,10 @@ func (epsd *EventPublishingServiceDiscovery) String() string { return epsd.serviceDiscovery.String() } -func (epsd *EventPublishingServiceDiscovery) Initialize(registryURL common.URL) error { +func (epsd *EventPublishingServiceDiscovery) Init(registryURL common.URL) error { var err error - epsd.once.Do(func() { - err = epsd.serviceDiscovery.Initialize(registryURL) + epsd.serviceDiscoveryInitOnce.Do(func() { + err = epsd.serviceDiscovery.Init(registryURL) }) return err } diff --git a/registry/nacos/service_discovery.go b/registry/nacos/service_discovery.go index 78c6c4c4fc7fdd8c49ce305776d2ea0f123df7a4..ad28c1a0fe8079134d5212b77194fab7b64544e0 100644 --- a/registry/nacos/service_discovery.go +++ b/registry/nacos/service_discovery.go @@ -63,7 +63,7 @@ type nacosServiceDiscovery struct { namingClient naming_client.INamingClient } -func (n *nacosServiceDiscovery) Initialize(registryURL common.URL) error { +func (n *nacosServiceDiscovery) Init(registryURL common.URL) error { return nil } diff --git a/registry/service_discovery.go b/registry/service_discovery.go index e4c4cc53a335f5a0f137dc6d3495c391b25dc237..a4e9e2421428b77ced2c26d544c6d0a8468c570a 100644 --- a/registry/service_discovery.go +++ b/registry/service_discovery.go @@ -42,7 +42,7 @@ type ServiceDiscovery interface { * Initializes the ServiceDiscovery * */ - Initialize(registryURL common.URL) error + Init(registryURL common.URL) error // Destroy will destroy the service discovery. // If the discovery cannot be destroy, it will return an error. diff --git a/registry/servicediscovery/service_discovery_registry.go b/registry/servicediscovery/service_discovery_registry.go index a1d3f120c11d5b2f6fd2139d3d435381a12eafb6..0dff3473be7032b7981190c18ee6502bfaaf2211 100644 --- a/registry/servicediscovery/service_discovery_registry.go +++ b/registry/servicediscovery/service_discovery_registry.go @@ -126,7 +126,7 @@ func creatServiceDiscovery(url *common.URL) (registry.ServiceDiscovery, error) { return nil, perrors.WithMessage(err, "Create service discovery fialed") } serviceDiscovery := event.NewEventPublishingServiceDiscovery(originServiceDiscovery) - serviceDiscovery.Initialize(*url) + serviceDiscovery.Init(*url) return serviceDiscovery, nil } diff --git a/registry/servicediscovery/service_discovery_registry_test.go b/registry/servicediscovery/service_discovery_registry_test.go index bf16ebdc1525fb5ff4de2e61eee25cec1c18624b..b42158c1f3c00b619a017b982f5f863bb3f1c4bc 100644 --- a/registry/servicediscovery/service_discovery_registry_test.go +++ b/registry/servicediscovery/service_discovery_registry_test.go @@ -126,7 +126,7 @@ func (m *mockServiceNameMapping) Get(serviceInterface string, group string, vers type mockServiceDiscovery struct { } -func (m *mockServiceDiscovery) Initialize(registryURL common.URL) error { +func (m *mockServiceDiscovery) Init(registryURL common.URL) error { return nil } diff --git a/registry/zookeeper/service_discovery.go b/registry/zookeeper/service_discovery.go index 314f56bdecec14390d8033c0c045a27b0076c488..bf73691c258cf962d1929db882b55dff9460d7aa 100644 --- a/registry/zookeeper/service_discovery.go +++ b/registry/zookeeper/service_discovery.go @@ -163,7 +163,7 @@ func (zksd *zookeeperServiceDiscovery) String() string { return fmt.Sprintf("zookeeper-service-discovery[%s]", zksd.url) } -func (zksd *zookeeperServiceDiscovery) Initialize(registryURL common.URL) error { +func (zksd *zookeeperServiceDiscovery) Init(registryURL common.URL) error { return nil }