diff --git a/config_center/nacos/client.go b/config_center/nacos/client.go
index 8dc742e5c4beddc07fafed37bd8bf4f87a6e3c07..3764ea4cf330e4846968c82a34e8bd6afa793b0b 100644
--- a/config_center/nacos/client.go
+++ b/config_center/nacos/client.go
@@ -25,19 +25,19 @@ const (
)
type NacosClient struct {
- name string
- NacosAddrs []string
- sync.Mutex // for Client
- Client *config_client.IConfigClient
- exit chan struct{}
- Timeout time.Duration
+ name string
+ NacosAddrs []string
+ sync.Mutex // for Client
+ Client *config_client.IConfigClient
+ exit chan struct{}
+ Timeout time.Duration
}
type Option func(*Options)
type Options struct {
nacosName string
- client *NacosClient
+ client *NacosClient
}
func WithNacosName(name string) Option {
@@ -84,19 +84,19 @@ func ValidateNacosClient(container nacosClientFacade, opts ...Option) error {
if container.NacosClient().Client == nil {
svrConfList := []nacosconst.ServerConfig{}
for _, nacosAddr := range container.NacosClient().NacosAddrs {
- split := strings.Split(nacosAddr,":")
+ split := strings.Split(nacosAddr, ":")
port, err := strconv.ParseUint(split[1], 10, 64)
if err != nil {
continue
}
svrconf := nacosconst.ServerConfig{
IpAddr: split[0],
- Port: port,
+ Port: port,
}
svrConfList = append(svrConfList, svrconf)
}
- client , err := clients.CreateConfigClient(map[string]interface{}{
+ client, err := clients.CreateConfigClient(map[string]interface{}{
"serverConfigs": svrConfList,
"clientConfig": nacosconst.ClientConfig{
TimeoutMs: uint64(container.NacosClient().Timeout.Nanoseconds() / 1e6),
@@ -116,31 +116,31 @@ func ValidateNacosClient(container nacosClientFacade, opts ...Option) error {
func newNacosClient(name string, nacosAddrs []string, timeout time.Duration) (*NacosClient, error) {
var (
- err error
- n *NacosClient
+ err error
+ n *NacosClient
)
n = &NacosClient{
- name: name,
- NacosAddrs: nacosAddrs,
- Timeout: timeout,
- exit: make(chan struct{}),
+ name: name,
+ NacosAddrs: nacosAddrs,
+ Timeout: timeout,
+ exit: make(chan struct{}),
}
svrConfList := []nacosconst.ServerConfig{}
for _, nacosAddr := range n.NacosAddrs {
- split := strings.Split(nacosAddr,":")
+ split := strings.Split(nacosAddr, ":")
port, err := strconv.ParseUint(split[1], 10, 64)
if err != nil {
continue
}
svrconf := nacosconst.ServerConfig{
IpAddr: split[0],
- Port: port,
+ Port: port,
}
svrConfList = append(svrConfList, svrconf)
}
- client , err := clients.CreateConfigClient(map[string]interface{}{
+ client, err := clients.CreateConfigClient(map[string]interface{}{
"serverConfigs": svrConfList,
"clientConfig": nacosconst.ClientConfig{
TimeoutMs: uint64(timeout.Nanoseconds() / 1e6),
@@ -159,32 +159,32 @@ func newNacosClient(name string, nacosAddrs []string, timeout time.Duration) (*N
func newMockNacosClient(name string, nacosAddrs []string, timeout time.Duration) (*NacosClient, error) {
var (
- err error
- n *NacosClient
+ err error
+ n *NacosClient
)
n = &NacosClient{
- name: name,
- NacosAddrs: nacosAddrs,
- Timeout: timeout,
- exit: make(chan struct{}),
+ name: name,
+ NacosAddrs: nacosAddrs,
+ Timeout: timeout,
+ exit: make(chan struct{}),
}
svrConfList := []nacosconst.ServerConfig{}
for _, nacosAddr := range n.NacosAddrs {
- split := strings.Split(nacosAddr,":")
+ split := strings.Split(nacosAddr, ":")
port, err := strconv.ParseUint(split[1], 10, 64)
if err != nil {
continue
}
svrconf := nacosconst.ServerConfig{
IpAddr: split[0],
- Port: port,
+ Port: port,
}
svrConfList = append(svrConfList, svrconf)
}
- client , err := clients.CreateConfigClient(map[string]interface{}{
+ client, err := clients.CreateConfigClient(map[string]interface{}{
"serverConfigs": svrConfList,
"clientConfig": nacosconst.ClientConfig{
TimeoutMs: uint64(timeout.Nanoseconds() / 1e6),
@@ -244,4 +244,4 @@ func (n *NacosClient) Close() {
}
n.Unlock()
logger.Warnf("nacosClient{name:%s, zk addr:%s} exit now.", n.name, n.NacosAddrs)
-}
\ No newline at end of file
+}
diff --git a/config_center/nacos/facade.go b/config_center/nacos/facade.go
index b0487b08f175b0053ad9eeacb381de92e3e8930a..e4f8ab7850ed008aa4788417ca0dff5a8e69cf48 100644
--- a/config_center/nacos/facade.go
+++ b/config_center/nacos/facade.go
@@ -94,5 +94,3 @@ LOOP:
}
}
}
-
-
diff --git a/config_center/nacos/impl.go b/config_center/nacos/impl.go
index f3b79bc256cbda10fb5df751a56ea2e76c405e7c..5d7213d3f404fac6daa2ce50db2a3aaf4da25387 100644
--- a/config_center/nacos/impl.go
+++ b/config_center/nacos/impl.go
@@ -37,21 +37,21 @@ import (
const NacosClientName = "nacos config_center"
type nacosDynamicConfiguration struct {
- url *common.URL
- rootPath string
- wg sync.WaitGroup
- cltLock sync.Mutex
- done chan struct{}
- client *NacosClient
+ url *common.URL
+ rootPath string
+ wg sync.WaitGroup
+ cltLock sync.Mutex
+ done chan struct{}
+ client *NacosClient
keyListeners sync.Map
parser parser.ConfigurationParser
}
func newNacosDynamicConfiguration(url *common.URL) (*nacosDynamicConfiguration, error) {
c := &nacosDynamicConfiguration{
- rootPath: "/" + url.GetParam(constant.CONFIG_NAMESPACE_KEY, config_center.DEFAULT_GROUP) + "/config",
- url: url,
- keyListeners:sync.Map{},
+ rootPath: "/" + url.GetParam(constant.CONFIG_NAMESPACE_KEY, config_center.DEFAULT_GROUP) + "/config",
+ url: url,
+ keyListeners: sync.Map{},
}
err := ValidateNacosClient(c, WithNacosName(NacosClientName))
if err != nil {
@@ -80,8 +80,8 @@ func (n *nacosDynamicConfiguration) GetProperties(key string, opts ...config_cen
opt(tmpOpts)
}
content, err := (*n.client.Client).GetConfig(vo.ConfigParam{
- DataId: key,
- Group: tmpOpts.Group,
+ DataId: key,
+ Group: tmpOpts.Group,
})
if err != nil {
return "", perrors.WithStack(err)
diff --git a/config_center/nacos/impl_test.go b/config_center/nacos/impl_test.go
index 1eaacdca76ee8181805d9267c998e3b842d333b6..514f924e3793e20325ee1ca49ae07fa412e05c54 100644
--- a/config_center/nacos/impl_test.go
+++ b/config_center/nacos/impl_test.go
@@ -51,9 +51,9 @@ func initNacosData(t *testing.T) (*nacosDynamicConfiguration, error) {
dubbo.protocols.myDubbo.name=dubbo
`
sucess, err := (*nacosConfiguration.client.Client).PublishConfig(vo.ConfigParam{
- DataId: "dubbo.properties",
- Group: "dubbo",
- Content: data,
+ DataId: "dubbo.properties",
+ Group: "dubbo",
+ Content: data,
})
assert.NoError(t, err)
if !sucess {
@@ -86,9 +86,9 @@ func Test_AddListener(t *testing.T) {
dubbo.protocols.myDubbo.name=dubbo
`
sucess, err := (*nacos.client.Client).PublishConfig(vo.ConfigParam{
- DataId: "dubbo.properties",
- Group: "dubbo",
- Content: data,
+ DataId: "dubbo.properties",
+ Group: "dubbo",
+ Content: data,
})
assert.NoError(t, err)
if !sucess {
@@ -99,12 +99,12 @@ func Test_AddListener(t *testing.T) {
}
-
func Test_RemoveListener(t *testing.T) {
//TODO not supported in current go_nacos_sdk version
}
+
type mockDataListener struct {
- wg sync.WaitGroup
+ wg sync.WaitGroup
event string
}
@@ -112,4 +112,4 @@ func (l *mockDataListener) Process(configType *config_center.ConfigChangeEvent)
fmt.Println("process!!!!!!!!!!")
l.wg.Done()
l.event = configType.Key
-}
\ No newline at end of file
+}
diff --git a/config_center/nacos/listener.go b/config_center/nacos/listener.go
index f284f2d7526b540cd27666caaa4c8867f140707a..86e1162ed12e9fb11fb17e9a1dfd80f669f43650 100644
--- a/config_center/nacos/listener.go
+++ b/config_center/nacos/listener.go
@@ -39,9 +39,9 @@ func (l *nacosDynamicConfiguration) addListener(key string, listener config_cent
if !loaded {
_, cancel := context.WithCancel(context.Background())
(*l.client.Client).ListenConfig(vo.ConfigParam{ //TODO 杩欎釜listen鎺ュ彛搴旇瑕佹湁涓猚ontext鐨�
- //(*l.client.Client).ListenConfigWithContext(ctx, vo.ConfigParam{
- DataId: key,
- Group: "dubbo",
+ //(*l.client.Client).ListenConfigWithContext(ctx, vo.ConfigParam{
+ DataId: key,
+ Group: "dubbo",
OnChange: func(namespace, group, dataId, data string) {
//go callback(ctx, listener, namespace, group, dataId, data)
go callback(context.TODO(), listener, namespace, group, dataId, data)