Revert "dial: return early on successful initial dial instead of bloc…

…king via sleep unconditionally"

This reverts commit a42a134.

apps/client/websocket/recws.go

@@ -80,9 +80,7 @@ type RecConn struct {
 // CloseAndReconnect will try to reconnect.
 func (rc *RecConn) CloseAndReconnect() {
 	rc.Close()
-	connected := make(chan<- struct{})
-	defer close(connected)
-	go rc.connect(connected)
+	go rc.connect()
 }
 
 // setIsConnected sets state for isConnected
@@ -350,23 +348,10 @@ func (rc *RecConn) Dial(urlStr string, reqHeader http.Header) {
 	rc.setDefaultDialer(rc.getTLSClientConfig(), rc.getHandshakeTimeout())
 
 	// Connect
-	connected := make(chan struct{})
-	go rc.connect(connected)
-	defer close(connected)
-
-	// wait for first attempt, but only up to a point
-	timer := time.NewTimer(rc.getHandshakeTimeout())
-	defer timer.Stop()
-
-	// no default case means this select will block until one of these conditions is met.
-	// this is still guaranteed to complete, since the fallback here is the timer
-	select {
-	// in this case, the dial error is deferred until rc.GetDialError()
-	case <-timer.C:
-		return
-	case <-connected:
-		return
-	}
+	go rc.connect()
+
+	// wait on first attempt
+	time.Sleep(rc.getHandshakeTimeout())
 }
 
 // GetURL returns current connection url
@@ -452,7 +437,7 @@ func (rc *RecConn) keepAlive() {
 	}()
 }
 
-func (rc *RecConn) connect(connected chan<- struct{}) {
+func (rc *RecConn) connect() {
 	b := rc.getBackoff()
 	rand.Seed(time.Now().UTC().UnixNano())
 
@@ -485,8 +470,6 @@ func (rc *RecConn) connect(connected chan<- struct{}) {
 				rc.keepAlive()
 			}
 
-			connected <- struct{}{}
-
 			return
 		}