x

chenquan · chenquan · commit ac6e2e1c3e45 · 2025-08-03T19:52:09.000+08:00
diff --git a/zrpc/internal/rpcpubserver.go b/zrpc/internal/rpcpubserver.go
@@ -66,6 +66,7 @@ func (s keepAliveServer) Start(fn RegisterFn) error {
 	ticker := time.NewTicker(time.Second)
 	defer ticker.Stop()
 
+l:
 	for {
 		select {
 		case <-ticker.C:
@@ -74,12 +75,17 @@ func (s keepAliveServer) Start(fn RegisterFn) error {
 				if err != nil {
 					return err
 				}
-				return <-chErr
+				// break for loop
+				break l
 			}
 		case <-ctx.Done():
 			return errNotReady
+		case err := <-chErr:
+			return err
 		}
 	}
+
+	return <-chErr
 }
 
 func figureOutListenOn(listenOn string) string {

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ func (s keepAliveServer) Start(fn RegisterFn) error {`
`66`	`66`	`ticker := time.NewTicker(time.Second)`
`67`	`67`	`defer ticker.Stop()`
`68`	`68`
	`69`	`+l:`
`69`	`70`	`for {`
`70`	`71`	`select {`
`71`	`72`	`case <-ticker.C:`
`@@ -74,12 +75,17 @@ func (s keepAliveServer) Start(fn RegisterFn) error {`
`74`	`75`	`if err != nil {`
`75`	`76`	`return err`
`76`	`77`	`}`
`77`		`- return <-chErr`
	`78`	`+ // break for loop`
	`79`	`+ break l`
`78`	`80`	`}`
`79`	`81`	`case <-ctx.Done():`
`80`	`82`	`return errNotReady`
	`83`	`+ case err := <-chErr:`
	`84`	`+ return err`
`81`	`85`	`}`
`82`	`86`	`}`
	`87`	`+`
	`88`	`+ return <-chErr`
`83`	`89`	`}`
`84`	`90`
`85`	`91`	`func figureOutListenOn(listenOn string) string {`