server: prevent increasing epochErrors if conn was established

In this commit, we fix a small bug where we would increase epochErrors
by one even if connections were successfully established. Due to this,
we would stay stuck inside of the peer bootstrapper loop without
requerying for new peers.
This commit is contained in:
Wilmer Paulino 2018-08-08 13:13:52 -07:00
parent 8379bbaa9b
commit 0de0a39291
No known key found for this signature in database
GPG Key ID: 6DF57B9F9514972F

View File

@ -1346,6 +1346,10 @@ func (s *server) peerBootstrapper(numTargetPeers uint32,
s.connectToPeer(a, errChan)
select {
case err := <-errChan:
if err == nil {
return
}
srvrLog.Errorf("Unable to "+
"connect to %v: %v",
a, err)
@ -1413,6 +1417,9 @@ func (s *server) initialPeerBootstrap(ignore map[autopilot.NodeID]struct{},
// us down.
select {
case err := <-errChan:
if err == nil {
return
}
srvrLog.Errorf("Unable to connect to "+
"%v: %v", addr, err)
// TODO: tune timeout? 3 seconds might be *too*