From 68dc90a7f758651f5744290ff1a4c45b1f31d5ac Mon Sep 17 00:00:00 2001
From: Matt Joiner <anacrolix@gmail.com>
Date: Wed, 7 Dec 2022 10:43:33 +1100
Subject: [PATCH] Rework logging
---
tracker/http/server/server.go | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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)
--
2.51.0