Tidy up some logging

diff --git a/client.go b/client.go
index 682cf8361850012b50118f49098765e71db57b26..9bd166106326e2963dfa4b588ba896ba9405f40c 100644 (file)
--- a/client.go
+++ b/client.go
@@ -1350,14 +1350,14 @@ func (cl *Client) newConnection(nc net.Conn, outgoing bool, remoteAddr net.Addr,
                writeBuffer: new(bytes.Buffer),
        }
        c.peerImpl = c
-       c.logger = cl.logger.WithDefaultLevel(log.Debug).WithContextValue(c)
+       c.logger = cl.logger.WithDefaultLevel(log.Warning).WithContextValue(c)
        c.writerCond.L = cl.locker()
        c.setRW(connStatsReadWriter{nc, c})
        c.r = &rateLimitedReader{
                l: cl.config.DownloadRateLimiter,
                r: c.r,
        }
-       c.logger.Printf("initialized with remote %v over network %v (outgoing=%t)", remoteAddr, network, outgoing)
+       c.logger.WithDefaultLevel(log.Debug).Printf("initialized with remote %v over network %v (outgoing=%t)", remoteAddr, network, outgoing)
        return
 }
 

diff --git a/peerconn.go b/peerconn.go
index 4cbe40bb4913c1c17f4158cb5894c4ea22969d6b..06537c9f97a30caabc6a6e158e9e7c217cbdd9f7 100644 (file)
--- a/peerconn.go
+++ b/peerconn.go
@@ -1341,7 +1341,7 @@ func (c *peer) receiveChunk(msg *pp.Message) error {
        piece.decrementPendingWrites()
 
        if err != nil {
-               c.logger.Printf("error writing received chunk %v: %v", req, err)
+               c.logger.WithDefaultLevel(log.Error).Printf("writing received chunk %v: %v", req, err)
                t.pendRequest(req)
                //t.updatePieceCompletion(pieceIndex(msg.Index))
                t.onWriteChunkErr(err)
@@ -1553,7 +1553,7 @@ func (c *PeerConn) setTorrent(t *Torrent) {
                panic("connection already associated with a torrent")
        }
        c.t = t
-       c.logger.Printf("torrent=%v", t)
+       c.logger.WithDefaultLevel(log.Debug).Printf("set torrent=%v", t)
        t.reconcileHandshakeStats(c)
 }
 

diff --git a/pexconn.go b/pexconn.go
index dcb3136c3ecfb6190cdb4d377fd6a2b5298f54b0..57ec7ff52e5442171e0f32d883cc63fe30b04b63 100644 (file)
--- a/pexconn.go
+++ b/pexconn.go
@@ -41,8 +41,8 @@ func (s *pexConnState) Init(c *PeerConn) {
        s.xid = xid
        s.seq = 0
        s.torrent = c.t
-       s.info = c.t.cl.logger
-       s.dbg = c.logger
+       s.info = c.t.cl.logger.WithDefaultLevel(log.Info)
+       s.dbg = c.logger.WithDefaultLevel(log.Debug)
        s.readyfn = c.tickleWriter
        s.gate = make(chan struct{}, 1)
        s.timer = time.AfterFunc(0, func() {