From 378ccd0932c5791e503fd32a82846d45263aad03 Mon Sep 17 00:00:00 2001
From: Matt Joiner <anacrolix@gmail.com>
Date: Tue, 17 Mar 2020 13:48:09 +1100
Subject: [PATCH] Logging improvements for DHT

---
 client.go  | 4 +++-
 torrent.go | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/client.go b/client.go
index 9095609b..8a94e021 100644
--- a/client.go
+++ b/client.go
@@ -318,7 +318,9 @@ func (cl *Client) newAnacrolixDhtServer(conn net.PacketConn) (s *dht.Server, err
 		StartingNodes:      cl.config.DhtStartingNodes(conn.LocalAddr().Network()),
 		ConnectionTracking: cl.config.ConnTracker,
 		OnQuery:            cl.config.DHTOnQuery,
-		Logger:             cl.logger.WithValues("dht", conn.LocalAddr().String()),
+		Logger: cl.logger.WithText(func(m log.Msg) string {
+			return fmt.Sprintf("dht server on %v: %s", conn.LocalAddr().String(), m.Text())
+		}),
 	}
 	s, err = dht.NewServer(&cfg)
 	if err == nil {
diff --git a/torrent.go b/torrent.go
index bcd80637..511abd71 100644
--- a/torrent.go
+++ b/torrent.go
@@ -1384,7 +1384,7 @@ func (t *Torrent) dhtAnnouncer(s DhtServer) {
 		cl.unlock()
 		err := t.announceToDht(true, s)
 		if err != nil {
-			t.logger.Printf("error announcing %q to DHT: %s", t, err)
+			t.logger.WithValues(log.Warning).Printf("error announcing %q to DHT: %s", t, err)
 		}
 	}
 }