x

Author: chenquan

zrpc/internal/rpcpubserver.go

@@ -54,19 +54,20 @@ type keepAliveServer struct {
 func (s keepAliveServer) Start(fn RegisterFn) error {
 	errCh := make(chan error)
 	stopCh := make(chan struct{})
-	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
-	defer cancel()
+	defer close(stopCh)
 
 	go func() {
 		defer close(errCh)
 		select {
-		case <-ctx.Done():
 		case errCh <- s.Server.Start(fn):
 		case <-stopCh:
+			// prevent goroutine leak
 		}
 	}()
 
 	// Wait for the service to start successfully, otherwise the registration service will fail.
+	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
+	defer cancel()
 	ticker := time.NewTicker(time.Second)
 
 l:
@@ -76,7 +77,6 @@ l:
 			if health.IsReady() {
 				err := s.registerEtcd()
 				if err != nil {
-					close(stopCh)
 					return err
 				}
 				// break for loop