Shorten timeout for unhandled error to 1 second

Signed-off-by: Jordan Liggitt <[email protected]>
moby · Jun 28, 2024 · 3f1023d · 3f1023d
1 parent ad82e28
commit 3f1023d
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/connection.go b/connection.go
@@ -741,7 +741,15 @@ func (s *Connection) shutdown(closeTimeout time.Duration) {
 	}
 
 	if err != nil {
-		duration := 10 * time.Minute
+		// default to 1 second
+		duration := time.Second
+		// if a closeTimeout was given, use that, clipped to 1s-10m
+		if closeTimeout > time.Second {
+			duration = closeTimeout
+		}
+		if duration > 10*time.Minute {
+			duration = 10 * time.Minute
+		}
 		timer := time.NewTimer(duration)
 		defer timer.Stop()
 		select {