From 472894d9dd3127e63e18f7ea08b601c01c18a27b Mon Sep 17 00:00:00 2001 From: Matt Joiner Date: Thu, 17 Mar 2022 14:58:32 +1100 Subject: [PATCH] Update dht logging --- client.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/client.go b/client.go index 31329ff3..4b6f1a24 100644 --- a/client.go +++ b/client.go @@ -380,6 +380,7 @@ func (cl *Client) listenNetworks() (ns []network) { // Creates an anacrolix/dht Server, as would be done internally in NewClient, for the given conn. func (cl *Client) NewAnacrolixDhtServer(conn net.PacketConn) (s *dht.Server, err error) { + logger := cl.logger.WithNames("dht", conn.LocalAddr().String()) cfg := dht.ServerConfig{ IPBlocklist: cl.ipBlockList, Conn: conn, @@ -392,7 +393,7 @@ func (cl *Client) NewAnacrolixDhtServer(conn net.PacketConn) (s *dht.Server, err }(), StartingNodes: cl.config.DhtStartingNodes(conn.LocalAddr().Network()), OnQuery: cl.config.DHTOnQuery, - Logger: cl.logger.WithContextText(fmt.Sprintf("dht server on %v", conn.LocalAddr().String())), + Logger: logger, } if f := cl.config.ConfigureAnacrolixDhtServer; f != nil { f(&cfg) @@ -402,9 +403,9 @@ func (cl *Client) NewAnacrolixDhtServer(conn net.PacketConn) (s *dht.Server, err go func() { ts, err := s.Bootstrap() if err != nil { - cl.logger.Printf("error bootstrapping dht: %s", err) + logger.Levelf(log.Warning, "error bootstrapping dht: %s", err) } - log.Fstr("%v completed bootstrap (%+v)", s, ts).AddValues(s, ts).Log(cl.logger) + logger.Levelf(log.Debug, "completed bootstrap: %+v", ts) }() } return -- 2.48.1