log username on invalid request

dimkr · Oct 2, 2024 · 34c6845 · 34c6845
1 parent 6cc35da
commit 34c6845
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/front/gemini/gemini.go b/front/gemini/gemini.go
@@ -153,7 +153,7 @@ func (gl *Listener) Handle(ctx context.Context, conn net.Conn) {
 	if r.User == nil {
 		r.Log = slog.With(slog.Group("request", "path", r.URL.Path))
 	} else {
-		r.Log = slog.With(slog.Group("request", "path", r.URL.Path, "user", r.User.ID))
+		r.Log = slog.With(slog.Group("request", "path", r.URL.Path, "user", r.User.PreferredUsername))
 	}
 
 	gl.Handler.Handle(&r, w)

diff --git a/front/handler.go b/front/handler.go
@@ -24,7 +24,6 @@ import (
 	"github.com/dimkr/tootik/cfg"
 	"github.com/dimkr/tootik/front/static"
 	"github.com/dimkr/tootik/front/text"
-	"log/slog"
 	"regexp"
 	"sync"
 	"time"
@@ -165,7 +164,7 @@ func (h *Handler) Handle(r *Request, w text.Writer) {
 		}
 	}
 
-	slog.Warn("Received an invalid request", "path", r.URL.Path)
+	r.Log.Warn("Received an invalid request")
 
 	if r.User == nil {
 		w.Redirect("/oops")