Merge pull request subutai-io#751 from subutai-io/updating-state-flow

Updating state flow
youdianwuliao · Mar 15, 2018 · 2fcd950 · 2fcd950
2 parents bbcf425 + e157cdf
commit 2fcd950
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/peer.go b/lib/peer.go
@@ -200,7 +200,7 @@ func (np *NetworkPeer) stateConnecting(ptpc *PeerToPeer) error {
 			return nil
 		}
 		if time.Since(started) > time.Duration(time.Millisecond*3000) && np.RemoteState == PeerStateWaitingToConnect {
-			np.SetState(PeerStateWaitingToConnect, ptpc)
+			np.SetState(PeerStateDisconnect, ptpc)
 			return nil
 		}
 		time.Sleep(time.Millisecond * 100)
@@ -276,7 +276,7 @@ func (np *NetworkPeer) stateWaitingForProxy(ptpc *PeerToPeer) error {
 func (np *NetworkPeer) stateWaitingToConnect(ptpc *PeerToPeer) error {
 	Log(Debug, "Waiting for peer [%s] to join connection state", np.ID)
 	started := time.Now()
-	timeout := time.Duration(60000 * time.Millisecond)
+	timeout := time.Duration(30000 * time.Millisecond)
 	recheck := time.Now()
 	recheckTimeout := time.Duration(5000 * time.Millisecond)
 	for {