Use net.DialTimeout in testPortConnectable

auxten · auxten · commit a86a398547ef · 2018-11-02T16:39:22.000+08:00
diff --git a/utils/net.go b/utils/net.go
@@ -34,8 +34,8 @@ var (
 	allocateLock   sync.Mutex
 )
 
-func testPortConnectable(addr string) bool {
-	conn, err := net.Dial("tcp", addr)
+func testPortConnectable(addr string, timeout time.Duration) bool {
+	conn, err := net.DialTimeout("tcp", addr, timeout)
 	if err != nil {
 		return false
 	} else {
@@ -72,7 +72,7 @@ func WaitToConnect(ctx context.Context, bindAddr string, ports []int, interval t
 		case <-time.After(interval):
 			for _, port := range ports {
 				addr := net.JoinHostPort(bindAddr, fmt.Sprint(port))
-				if !testPortConnectable(addr) {
+				if !testPortConnectable(addr, 500*time.Millisecond) {
 					goto continueCheckC
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ var (`
`34`	`34`	`allocateLock sync.Mutex`
`35`	`35`	`)`
`36`	`36`
`37`		`-func testPortConnectable(addr string) bool {`
`38`		`- conn, err := net.Dial("tcp", addr)`
	`37`	`+func testPortConnectable(addr string, timeout time.Duration) bool {`
	`38`	`+ conn, err := net.DialTimeout("tcp", addr, timeout)`
`39`	`39`	`if err != nil {`
`40`	`40`	`return false`
`41`	`41`	`} else {`
`@@ -72,7 +72,7 @@ func WaitToConnect(ctx context.Context, bindAddr string, ports []int, interval t`
`72`	`72`	`case <-time.After(interval):`
`73`	`73`	`for _, port := range ports {`
`74`	`74`	`addr := net.JoinHostPort(bindAddr, fmt.Sprint(port))`
`75`		`- if !testPortConnectable(addr) {`
	`75`	`+ if !testPortConnectable(addr, 500*time.Millisecond) {`
`76`	`76`	`goto continueCheckC`
`77`	`77`	`}`
`78`	`78`	`}`