Log port wait errors

Related to cirruslabs/cirrus-ci-docs#1034
cirruslabs · Jul 22, 2022 · a245b58 · a245b58
1 parent a2c1f92
commit a245b58
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/cmd/agent/main.go b/cmd/agent/main.go
@@ -204,7 +204,10 @@ func main() {
 			log.Printf("Waiting on port %v...\n", port)
 
 			subCtx, cancel := context.WithTimeout(ctx, 60*time.Second)
-			network.WaitForLocalPort(subCtx, portNumber)
+			portErr := network.WaitForLocalPort(subCtx, portNumber)'
+			if portErr != nil {
+				log.Printf("Failed to wait fo port %v: %v\n", port, portErr)
+			}
 			cancel()
 		}
 	}

diff --git a/internal/network/network.go b/internal/network/network.go
@@ -9,15 +9,15 @@ import (
 	"time"
 )
 
-func WaitForLocalPort(ctx context.Context, port int) {
+func WaitForLocalPort(ctx context.Context, port int) error {
 	dialer := net.Dialer{
 		Timeout: 10 * time.Second,
 	}
 
 	var conn net.Conn
 	var err error
 
-	_ = retry.Do(
+	return retry.Do(
 		func() error {
 			conn, err = dialer.DialContext(ctx, "tcp", fmt.Sprintf("localhost:%d", port))
 			if err != nil {

diff --git a/internal/network/network_test.go b/internal/network/network_test.go
@@ -29,7 +29,8 @@ func TestEarlyExit(t *testing.T) {
 	defer cancel()
 
 	start := time.Now()
-	network.WaitForLocalPort(ctx, port)
+	err = network.WaitForLocalPort(ctx, port)
+	assert.Nil(t, err)
 	stop := time.Now()
 
 	assert.WithinDuration(t, stop, start, maxExpectedWaitTime)