Logging improvements for DHT

diff --git a/client.go b/client.go
index 9095609b847443e21e19e7fa9e0a7dbd8ad3fd64..8a94e021756b5ff5c8a75a6af77043b169071cc8 100644 (file)
--- 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 bcd80637258df5f42220064291fb4d2958150583..511abd7192a07640a0cc982165a8c1a90960ae80 100644 (file)
--- 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)
                }
        }
 }