From 070e11a0ddca3e57381cbe1158123638ce0a75f8 Mon Sep 17 00:00:00 2001
From: Matt Joiner <anacrolix@gmail.com>
Date: Thu, 16 Apr 2020 12:17:18 +1000
Subject: [PATCH] Adjust recently added logging

---
 Peer.go            | 9 +++++++++
 torrent.go         | 4 +++-
 tracker_scraper.go | 3 ++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Peer.go b/Peer.go
index 784e38c3..d62b028f 100644
--- a/Peer.go
+++ b/Peer.go
@@ -20,6 +20,15 @@ type Peer struct {
 	Trusted bool
 }
 
+func (me Peer) Equal(other Peer) bool {
+	return me.Id == other.Id &&
+		me.Addr.String() == other.Addr.String() &&
+		me.Source == other.Source &&
+		me.SupportsEncryption == other.SupportsEncryption &&
+		me.PexPeerFlags == other.PexPeerFlags &&
+		me.Trusted == other.Trusted
+}
+
 // FromPex generate Peer from peer exchange
 func (me *Peer) FromPex(na krpc.NodeAddr, fs peer_protocol.PexPeerFlags) {
 	me.Addr = ipPortAddr{append([]byte(nil), na.IP...), na.Port}
diff --git a/torrent.go b/torrent.go
index ca4df475..d81437ad 100644
--- a/torrent.go
+++ b/torrent.go
@@ -269,7 +269,9 @@ func (t *Torrent) addPeer(p Peer) {
 	}
 	if replaced, ok := t.peers.AddReturningReplacedPeer(p); ok {
 		torrent.Add("peers replaced", 1)
-		t.logger.Printf("added %v replacing %v", p, replaced)
+		if !replaced.Equal(p) {
+			t.logger.Printf("added %v replacing %v", p, replaced)
+		}
 	}
 	t.openNewConns()
 	for t.peers.Len() > cl.config.TorrentPeersHighWater {
diff --git a/tracker_scraper.go b/tracker_scraper.go
index 50b582c2..ffe4be6c 100644
--- a/tracker_scraper.go
+++ b/tracker_scraper.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/anacrolix/dht/v2/krpc"
+	"github.com/anacrolix/log"
 
 	"github.com/anacrolix/torrent/tracker"
 )
@@ -116,7 +117,7 @@ func (me *trackerScraper) announce(event tracker.AnnounceEvent) (ret trackerAnno
 	me.t.cl.rLock()
 	req := me.t.announceRequest(event)
 	me.t.cl.rUnlock()
-	me.t.logger.Printf("announcing to %q: %#v", me.u.String(), req)
+	me.t.logger.WithValues(log.Debug).Printf("announcing to %q: %#v", me.u.String(), req)
 	res, err := tracker.Announce{
 		HTTPProxy:  me.t.cl.config.HTTPProxy,
 		UserAgent:  me.t.cl.config.HTTPUserAgent,