From e1078686b3d821be75e0b827b9015cb5761a6f92 Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@tailscale.com>
Date: Fri, 21 Mar 2025 10:36:18 -0700
Subject: [PATCH] safesocket: respect context timeout when sleeping for 250ms
 in retry loop

Noticed while working on a dev tool that uses local.Client.

Updates #cleanup

Change-Id: I981efff74a5cac5f515755913668bd0508a4aa14
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
---
 safesocket/safesocket.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/safesocket/safesocket.go b/safesocket/safesocket.go
index 991fddf5f..721b694dc 100644
--- a/safesocket/safesocket.go
+++ b/safesocket/safesocket.go
@@ -61,7 +61,11 @@ func ConnectContext(ctx context.Context, path string) (net.Conn, error) {
 			if ctx.Err() != nil {
 				return nil, ctx.Err()
 			}
-			time.Sleep(250 * time.Millisecond)
+			select {
+			case <-ctx.Done():
+				return nil, ctx.Err()
+			case <-time.After(250 * time.Millisecond):
+			}
 			continue
 		}
 		return c, err