From 6805ddf1b8d5ffa904b83be1e74b09c64bb0c6c5 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Sat, 28 Apr 2018 16:00:45 -0400
Subject: [PATCH] p2p: change some logs from Error to Debug. #1476

---
 p2p/pex/pex_reactor.go | 31 +++++++++++++------------------
 p2p/switch.go          |  9 ++++++---
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/p2p/pex/pex_reactor.go b/p2p/pex/pex_reactor.go
index 357926495..b26e7d3af 100644
--- a/p2p/pex/pex_reactor.go
+++ b/p2p/pex/pex_reactor.go
@@ -181,16 +181,19 @@ func (r *PEXReactor) AddPeer(p Peer) {
 		// add to book. dont RequestAddrs right away because
 		// we don't trust inbound as much - let ensurePeersRoutine handle it.
 		err := r.book.AddAddress(addr, src)
-		if err != nil {
-			switch err.(type) {
-			case ErrAddrBookNilAddr:
-				r.Logger.Error("Failed to add new address", "err", err)
-			default:
-				// non-routable, self, full book, etc.
-				r.Logger.Debug("Failed to add new address", "err", err)
-			}
-		}
+		r.logErrAddrBook(err)
+	}
+}
 
+func (r *PEXReactor) logErrAddrBook(err error) {
+	if err != nil {
+		switch err.(type) {
+		case ErrAddrBookNilAddr:
+			r.Logger.Error("Failed to add new address", "err", err)
+		default:
+			// non-routable, self, full book, etc.
+			r.Logger.Debug("Failed to add new address", "err", err)
+		}
 	}
 }
 
@@ -313,15 +316,7 @@ func (r *PEXReactor) ReceiveAddrs(addrs []*p2p.NetAddress, src Peer) error {
 		}
 
 		err := r.book.AddAddress(netAddr, srcAddr)
-		if err != nil {
-			switch err.(type) {
-			case ErrAddrBookNilAddr:
-				r.Logger.Error("Failed to add new address", "err", err)
-			default:
-				// Could be non-routable, self, or full book. But not worth logging an Error
-				r.Logger.Debug("Failed to add new address", "err", err)
-			}
-		}
+		r.logErrAddrBook(err)
 	}
 	return nil
 }
diff --git a/p2p/switch.go b/p2p/switch.go
index 1f0c01f02..5d0bb4f88 100644
--- a/p2p/switch.go
+++ b/p2p/switch.go
@@ -401,7 +401,12 @@ func (sw *Switch) DialPeersAsync(addrBook AddrBook, peers []string, persistent b
 			sw.randomSleep(0)
 			err := sw.DialPeerWithAddress(addr, persistent)
 			if err != nil {
-				sw.Logger.Error("Error dialing peer", "err", err)
+				switch err.(type) {
+				case ErrSwitchConnectToSelf, ErrSwitchDuplicatePeer:
+					sw.Logger.Debug("Error dialing peer", "err", err)
+				default:
+					sw.Logger.Error("Error dialing peer", "err", err)
+				}
 			}
 		}(i)
 	}
@@ -500,7 +505,6 @@ func (sw *Switch) addOutboundPeerWithConfig(addr *NetAddress, config *PeerConfig
 	sw.Logger.Info("Dialing peer", "address", addr)
 	peerConn, err := newOutboundPeerConn(addr, config, persistent, sw.nodeKey.PrivKey)
 	if err != nil {
-		sw.Logger.Error("Failed to dial peer", "address", addr, "err", err)
 		if persistent {
 			go sw.reconnectToPeer(addr)
 		}
@@ -508,7 +512,6 @@ func (sw *Switch) addOutboundPeerWithConfig(addr *NetAddress, config *PeerConfig
 	}
 
 	if err := sw.addPeer(peerConn); err != nil {
-		sw.Logger.Error("Failed to add peer", "address", addr, "err", err)
 		peerConn.CloseConn()
 		return err
 	}