From a12a833b209030d2d6e0cd5c3fe60bba9be9f1a4 Mon Sep 17 00:00:00 2001 From: Simon Ferquel Date: Mon, 21 Nov 2016 06:24:30 -0500 Subject: [PATCH] [vsudd] Don't retry when dockerd is not running Signed-off-by: Simon Ferquel --- alpine/packages/vsudd/main.go | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/alpine/packages/vsudd/main.go b/alpine/packages/vsudd/main.go index 206c530f4..30b4d9fbf 100644 --- a/alpine/packages/vsudd/main.go +++ b/alpine/packages/vsudd/main.go @@ -12,7 +12,6 @@ import ( "strings" "sync" "syscall" - "time" "github.com/rneugeba/virtsock/go/hvsock" "github.com/rneugeba/virtsock/go/vsock" @@ -189,17 +188,11 @@ func handleOneIn(connid int, conn vConn, sock string) { var docker *net.UnixConn var err error - // Cope with the server socket appearing up to 10s later - for i := 0; i < 200; i++ { - docker, err = net.DialUnix("unix", nil, &net.UnixAddr{sock, "unix"}) - if err == nil { - break - } - time.Sleep(50 * time.Millisecond) - } + docker, err = net.DialUnix("unix", nil, &net.UnixAddr{sock, "unix"}) + if err != nil { // If the forwarding program has broken then close and continue - log.Println(connid, "Failed to connect to Unix domain socket after 10s", sock, err) + log.Println(connid, "Failed to connect to Unix domain socket", sock, err) return } defer func() {