From 6aedd1af8dc1442220b4549f87c26ab831f67850 Mon Sep 17 00:00:00 2001
From: flycash <flycash@apache.org>
Date: Wed, 8 Apr 2020 21:30:04 +0800
Subject: [PATCH] rename baseRegistry to nacosBaseRegistry
---
registry/nacos/base_registry.go | 10 +++++-----
registry/nacos/registry.go | 2 +-
registry/nacos/service_discovery.go | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/registry/nacos/base_registry.go b/registry/nacos/base_registry.go
index bd5dc86b4..63f499967 100644
--- a/registry/nacos/base_registry.go
+++ b/registry/nacos/base_registry.go
@@ -38,22 +38,22 @@ import (
// baseRegistry is the parent of both interface-level registry
// and service discovery(related to application-level registry)
-type baseRegistry struct {
+type nacosBaseRegistry struct {
*common.URL
namingClient naming_client.INamingClient
}
// newBaseRegistry will create new instance
-func newBaseRegistry(url *common.URL) (baseRegistry, error) {
+func newBaseRegistry(url *common.URL) (nacosBaseRegistry, error) {
nacosConfig, err := getNacosConfig(url)
if err != nil {
- return baseRegistry{}, err
+ return nacosBaseRegistry{}, err
}
client, err := clients.CreateNamingClient(nacosConfig)
if err != nil {
- return baseRegistry{}, err
+ return nacosBaseRegistry{}, err
}
- registry := baseRegistry{
+ registry := nacosBaseRegistry{
URL: url,
namingClient: client,
}
diff --git a/registry/nacos/registry.go b/registry/nacos/registry.go
index b0f399862..a436b8506 100644
--- a/registry/nacos/registry.go
+++ b/registry/nacos/registry.go
@@ -53,7 +53,7 @@ func init() {
}
type nacosRegistry struct {
- baseRegistry
+ nacosBaseRegistry
}
// newNacosRegistry will create an instance
diff --git a/registry/nacos/service_discovery.go b/registry/nacos/service_discovery.go
index b89d4f611..8ef72c1b1 100644
--- a/registry/nacos/service_discovery.go
+++ b/registry/nacos/service_discovery.go
@@ -47,7 +47,7 @@ func init() {
// There is a problem, the go client for nacos does not support the id field.
// we will use the metadata to store the id of ServiceInstance
type nacosServiceDiscovery struct {
- baseRegistry
+ nacosBaseRegistry
group string
}
@@ -279,7 +279,7 @@ func newNacosServiceDiscovery(url *common.URL) (registry.ServiceDiscovery, error
return nil, perrors.WithStack(err)
}
return &nacosServiceDiscovery{
- baseRegistry: base,
+ nacosBaseRegistry: base,
group: url.GetParam(constant.NACOS_GROUP, defaultGroup),
}, nil
}
--
GitLab