From: Matt Joiner <anacrolix@gmail.com>
Date: Mon, 30 Jun 2014 14:05:28 +0000 (+1000)
Subject: Improve some log messages
X-Git-Tag: v1.0.0~1689
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=0f53e89e7bc0aef33efb94a6ee5221f6449aae5e;p=btrtrc.git

Improve some log messages
---

diff --git a/client.go b/client.go
index f19d5818..f7ef9291 100644
--- a/client.go
+++ b/client.go
@@ -502,7 +502,7 @@ func (cl *Client) gotMetadataExtensionMsg(payload []byte, t *torrent, c *connect
 	var d map[string]int
 	err = bencode.Unmarshal(payload, &d)
 	if err != nil {
-		err = fmt.Errorf("error unmarshalling payload: %s", err)
+		err = fmt.Errorf("error unmarshalling payload: %s: %q", err, payload)
 		return
 	}
 	msgType, ok := d["msg_type"]
@@ -702,6 +702,9 @@ func (me *Client) connectionLoop(t *torrent, c *connection) error {
 				}
 			case 1:
 				err = me.gotMetadataExtensionMsg(msg.ExtendedPayload, t, c)
+				if err != nil {
+					err = fmt.Errorf("error handling metadata extension message: %s", err)
+				}
 			case 2:
 				var pexMsg peerExchangeMessage
 				err := bencode.Unmarshal(msg.ExtendedPayload, &pexMsg)
@@ -1051,12 +1054,16 @@ func (me *Client) downloadedChunk(t *torrent, c *connection, msg *pp.Message) er
 	}
 
 	// Cancel pending requests for this chunk.
+	cancelled := false
 	for _, c := range t.Conns {
 		if me.connCancel(t, c, req) {
-			log.Print("cancelled concurrent request for %v", req)
+			cancelled = true
 			me.replenishConnRequests(t, c)
 		}
 	}
+	if cancelled {
+		log.Print("cancelled concurrent requests for %v", req)
+	}
 
 	me.dataReady(dataSpec{t.InfoHash, req})
 	return nil