server: use one func for peer re-connection

Let the connectToPersistentPeer func handle all connection attempts to
persistent peers so that that logic is in once place.

server.go

@@ -2798,20 +2798,11 @@ func (s *server) establishPersistentConnections() error {
 				IdentityKey: nodeAddr.pubKey,
 				Address:     address,
 			}
-			srvrLog.Debugf("Attempting persistent connection to "+
-				"channel peer %v", lnAddr)
 
-			// Send the persistent connection request to the
+			s.persistentPeerAddrs[pubStr] = append(
-			// connection manager, saving the request itself so we
+				s.persistentPeerAddrs[pubStr], lnAddr)
-			// can cancel/restart the process as needed.
-			connReq := &connmgr.ConnReq{
-				Addr:      lnAddr,
-				Permanent: true,
 		}
 
-			s.persistentConnReqs[pubStr] = append(
-				s.persistentConnReqs[pubStr], connReq)
-
 		// We'll connect to the first 10 peers immediately, then
 		// randomly stagger any remaining connections if the
 		// stagger initial reconnect flag is set. This ensures
@@ -2822,10 +2813,9 @@ func (s *server) establishPersistentConnections() error {
 		if numOutboundConns < numInstantInitReconnect ||
 			!s.cfg.StaggerInitialReconnect {
 
-				go s.connMgr.Connect(connReq)
+			go s.connectToPersistentPeer(pubStr)
 		} else {
-				go s.delayInitialReconnect(connReq)
+			go s.delayInitialReconnect(pubStr)
-			}
 		}
 
 		numOutboundConns++
@@ -2834,16 +2824,15 @@ func (s *server) establishPersistentConnections() error {
 	return nil
 }
 
-// delayInitialReconnect will attempt a reconnection using the passed connreq
+// delayInitialReconnect will attempt a reconnection to the given peer after
-// after sampling a value for the delay between 0s and the
+// sampling a value for the delay between 0s and the maxInitReconnectDelay.
-// maxInitReconnectDelay.
 //
 // NOTE: This method MUST be run as a goroutine.
-func (s *server) delayInitialReconnect(connReq *connmgr.ConnReq) {
+func (s *server) delayInitialReconnect(pubStr string) {
 	delay := time.Duration(prand.Intn(maxInitReconnectDelay)) * time.Second
 	select {
 	case <-time.After(delay):
-		s.connMgr.Connect(connReq)
+		s.connectToPersistentPeer(pubStr)
 	case <-s.quit:
 	}
 }
@@ -3822,9 +3811,16 @@ func (s *server) connectToPersistentPeer(pubKeyStr string) {
 			Permanent: true,
 		}
 
+		srvrLog.Debugf("Attempting persistent connection to "+
+			"channel peer %v", addr)
+
+		// Send the persistent connection request to the connection
+		// manager, saving the request itself so we can cancel/restart
+		// the process as needed.
 		s.persistentConnReqs[pubKeyStr] = append(
 			s.persistentConnReqs[pubKeyStr], connReq,
 		)
+
 		go s.connMgr.Connect(connReq)
 	}
 }