diff --git a/contrib/config/nacos/config_test.go b/contrib/config/nacos/config_test.go index 9065ac91f..2fdc4f6b0 100644 --- a/contrib/config/nacos/config_test.go +++ b/contrib/config/nacos/config_test.go @@ -88,10 +88,10 @@ logger: } fmt.Println("get value", name) - done := make(chan bool) + done := make(chan struct{}) err = c.Watch("logger.level", func(key string, value kconfig.Value) { fmt.Println(key, " value change", value) - done <- true + done <- struct{}{} }) if err != nil { t.Fatal(err) diff --git a/contrib/registry/nacos/watcher.go b/contrib/registry/nacos/watcher.go index 3cb1d0f77..22961b69f 100644 --- a/contrib/registry/nacos/watcher.go +++ b/contrib/registry/nacos/watcher.go @@ -18,7 +18,7 @@ type watcher struct { groupName string ctx context.Context cancel context.CancelFunc - watchChan chan bool + watchChan chan struct{} cli naming_client.INamingClient } @@ -28,7 +28,7 @@ func newWatcher(ctx context.Context, cli naming_client.INamingClient, serviceNam clusters: clusters, groupName: groupName, cli: cli, - watchChan: make(chan bool, 1), + watchChan: make(chan struct{}, 1), } w.ctx, w.cancel = context.WithCancel(ctx) @@ -37,7 +37,7 @@ func newWatcher(ctx context.Context, cli naming_client.INamingClient, serviceNam Clusters: clusters, GroupName: groupName, SubscribeCallback: func(services []model.SubscribeService, err error) { - w.watchChan <- true + w.watchChan <- struct{}{} }, }) return w, e diff --git a/transport/grpc/resolver/discovery/builder.go b/transport/grpc/resolver/discovery/builder.go index e6a56b530..de8dccf2a 100644 --- a/transport/grpc/resolver/discovery/builder.go +++ b/transport/grpc/resolver/discovery/builder.go @@ -63,7 +63,7 @@ func (b *builder) Build(target resolver.Target, cc resolver.ClientConn, opts res err error w registry.Watcher ) - done := make(chan bool, 1) + done := make(chan struct{}, 1) ctx, cancel := context.WithCancel(context.Background()) go func() { w, err = b.discoverer.Watch(ctx, strings.TrimPrefix(target.URL.Path, "/"))