fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-07-30 19:51:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #39 from tendermint/development

Browse Source 
Development
This commit is contained in:
Jae Kwon
2015-03-21 17:41:41 -07:00
parent 3b05b24b68 5c8e69d6de
commit 43a0c253f8
5 changed files with 85 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
p2p/switch.go
View File

@@ -143,17 +143,20 @@ func (sw *Switch) DialPeerWithAddress(addr *NetAddress) (*Peer, error) {
return nil, ErrSwitchStopped
}
log.Info("Dialing peer", "address", addr)
log.Debug("Dialing address", "address", addr)
sw.dialing.Set(addr.String(), addr)
conn, err := addr.DialTimeout(peerDialTimeoutSeconds * time.Second)
sw.dialing.Delete(addr.String())
if err != nil {
log.Debug("Failed dialing address", "address", addr, "error", err)
return nil, err
}
peer, err := sw.AddPeerWithConnection(conn, true)
if err != nil {
log.Debug("Failed adding peer", "address", addr, "conn", conn, "error", err)
return nil, err
}
log.Info("Dialed and added peer", "address", addr, "peer", peer)
return peer, nil
}