From: Matt Joiner <anacrolix@gmail.com>
Date: Tue, 6 Dec 2022 23:43:33 +0000 (+1100)
Subject: Rework logging
X-Git-Tag: v1.49.0~7^2~27
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=68dc90a7f758651f5744290ff1a4c45b1f31d5ac;p=btrtrc.git

Rework logging
---

diff --git a/tracker/http/server/server.go b/tracker/http/server/server.go
index 10713a1b..ed08ac92 100644
--- a/tracker/http/server/server.go
+++ b/tracker/http/server/server.go
@@ -34,8 +34,6 @@ func unmarshalQueryKeyToArray(w http.ResponseWriter, key string, query url.Value
 	return
 }
 
-var Logger = log.NewLogger("anacrolix", "torrent", "tracker", "http", "server")
-
 // Returns false if there was an error and it was served.
 func (me Handler) requestHostAddr(r *http.Request) (_ netip.Addr, err error) {
 	if me.RequestHost != nil {
@@ -48,6 +46,8 @@ func (me Handler) requestHostAddr(r *http.Request) (_ netip.Addr, err error) {
 	return netip.ParseAddr(host)
 }
 
+var requestHeadersLogger = log.Default.WithNames("request", "headers")
+
 func (me Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	vs := r.URL.Query()
 	var event tracker.AnnounceEvent
@@ -64,7 +64,7 @@ func (me Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if !ok {
 		return
 	}
-	Logger.WithNames("request").Levelf(log.Debug, "request RemoteAddr=%q, header=%q", r.RemoteAddr, r.Header)
+	requestHeadersLogger.Levelf(log.Debug, "request RemoteAddr=%q, header=%q", r.RemoteAddr, r.Header)
 	addr, err := me.requestHostAddr(r)
 	if err != nil {
 		log.Printf("error getting requester IP: %v", err)