[vsudd] Don't retry when dockerd is not running

Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
This commit is contained in:
Simon Ferquel 2016-11-21 06:24:30 -05:00
parent 228acc91f5
commit a12a833b20

View File

@ -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() {