consistent logging

server/serve_announce.go

@@ -72,7 +72,16 @@ func (s Server) serveAnnounce(w http.ResponseWriter, r *http.Request) {
 
 	writeAnnounceResponse(w, announce, user, torrent)
 
-	log.Infof("chihaya: handled announce from %s", announce.IP)
+	w.(http.Flusher).Flush()
+
+	if log.V(5) {
+		log.Infof(
+			"announce: ip: %s, user: %s, torrent: %s",
+			announce.IP,
+			user.ID,
+			torrent.ID,
+		)
+	}
 }
 
 func updateTorrent(c tracker.Conn, a *models.Announce, p *models.Peer, t *models.Torrent) (created bool, err error) {
@@ -174,12 +183,13 @@ func writeAnnounceResponse(w io.Writer, a *models.Announce, u *models.User, t *m
 		bencoder.Encode("peers")
 
 		var peerCount int
+		if a.Left == 0 {
+			peerCount = minInt(a.NumWant, leechCount)
+		} else {
+			peerCount = minInt(a.NumWant, leechCount+seedCount-1)
+		}
+
 		if a.Compact {
-			if a.Left == 0 {
-				peerCount = minInt(a.NumWant, leechCount)
-			} else {
-				peerCount = minInt(a.NumWant, leechCount+seedCount-1)
-			}
 			// 6 is the number of bytes 1 compact peer takes up.
 			bencoder.Encode(strconv.Itoa(peerCount * 6))
 			bencoder.Encode(":")
@@ -187,17 +197,13 @@ func writeAnnounceResponse(w io.Writer, a *models.Announce, u *models.User, t *m
 			bencoder.Encode("l")
 		}
 
-		var count int
 		if a.Left == 0 {
 			// If they're seeding, give them only leechers
-			count = writePeers(w, u, t.Leechers, a.NumWant, a.Compact)
+			writePeers(w, u, t.Leechers, peerCount, a.Compact)
 		} else {
 			// If they're leeching, prioritize giving them seeders
-			count += writePeers(w, u, t.Seeders, a.NumWant, a.Compact)
-			count += writePeers(w, u, t.Leechers, a.NumWant-count, a.Compact)
-		}
-		if a.Compact && peerCount != count {
-			log.Errorf("calculated peer count (%d) != real count (%d)", peerCount, count)
+			count := writePeers(w, u, t.Seeders, peerCount, a.Compact)
+			writePeers(w, u, t.Leechers, peerCount-count, a.Compact)
 		}
 
 		if !a.Compact {

server/serve_scrape.go

@@ -7,6 +7,7 @@ package server
 import (
 	"io"
 	"net/http"
+	"strings"
 
 	log "github.com/golang/glog"
 
@@ -26,15 +27,19 @@ func (s *Server) serveScrape(w http.ResponseWriter, r *http.Request) {
 		fail(err, w, r)
 	}
 
+	var user *models.User
 	if s.conf.Private {
-		_, err = conn.FindUser(scrape.Passkey)
+		user, err = conn.FindUser(scrape.Passkey)
 		if err != nil {
 			fail(err, w, r)
 			return
 		}
 	}
 
-	var torrents []*models.Torrent
+	var (
+		torrents   []*models.Torrent
+		torrentIDs []string
+	)
 	for _, infohash := range scrape.Infohashes {
 		torrent, err := conn.FindTorrent(infohash)
 		if err != nil {
@@ -42,6 +47,7 @@ func (s *Server) serveScrape(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 		torrents = append(torrents, torrent)
+		torrentIDs = append(torrentIDs, string(torrent.ID))
 	}
 
 	bencoder := bencode.NewEncoder(w)
@@ -52,9 +58,14 @@ func (s *Server) serveScrape(w http.ResponseWriter, r *http.Request) {
 	}
 	bencoder.Encode("e")
 
-	log.V(3).Infof("chihaya: handled scrape from %s", r.RemoteAddr)
-
 	w.(http.Flusher).Flush()
+
+	log.V(5).Infof(
+		"scrape: ip: %s user: %s torrents: %s",
+		r.RemoteAddr,
+		user.ID,
+		strings.Join(torrentIDs, ", "),
+	)
 }
 
 func writeTorrentStatus(w io.Writer, t *models.Torrent) {

server/server.go

@@ -128,7 +128,11 @@ func fail(err error, w http.ResponseWriter, r *http.Request) {
 	length, _ := io.WriteString(w, msg)
 	w.Header().Add("Content-Length", string(length))
 
-	log.V(2).Infof("chihaya: handled failure: %s from %s ", errmsg, r.RemoteAddr)
-
 	w.(http.Flusher).Flush()
+
+	log.V(5).Infof(
+		"failed request: ip: %s failure: %s",
+		r.RemoteAddr,
+		errmsg,
+	)
 }