From 9713cd81fc8499feb8195cc357f20657c0a26ffc Mon Sep 17 00:00:00 2001 From: Conner Fromknecht Date: Fri, 17 Nov 2017 15:31:44 -0800 Subject: [PATCH] server: reorder short-circuit in peer termination watcher This commit reorders logic in the peer termination watcher such that we short circuit earlier if we already have pending persistent connection requests. Before, the debug statement may have indicated that a reconnection was being attempted, even though it may have exited before submitting the request to the connection manager. --- server.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/server.go b/server.go index 8d2429eb..b23ff006 100644 --- a/server.go +++ b/server.go @@ -364,7 +364,6 @@ func newServer(listenAddrs []string, chanDB *channeldb.DB, cc *chainControl, OnAccept: s.InboundPeerConnected, RetryDuration: time.Second * 5, TargetOutbound: 100, - GetNewAddress: nil, Dial: noiseDial(s.identityPriv), OnConnection: s.OutboundPeerConnected, }) @@ -1087,6 +1086,12 @@ func (s *server) peerTerminationWatcher(p *peer) { pubStr := string(p.addr.IdentityKey.SerializeCompressed()) _, ok := s.persistentPeers[pubStr] if ok { + // We'll only need to re-launch a connection request if one + // isn't already currently pending. + if _, ok := s.persistentConnReqs[pubStr]; ok { + return + } + srvrLog.Debugf("Attempting to re-establish persistent "+ "connection to peer %v", p) @@ -1098,12 +1103,6 @@ func (s *server) peerTerminationWatcher(p *peer) { Permanent: true, } - // We'll only need to re-launch a connection requests if one - // isn't already currently pending. - if _, ok := s.persistentConnReqs[pubStr]; ok { - return - } - // Otherwise, we'll launch a new connection requests in order // to attempt to maintain a persistent connection with this // peer.