From 97ddaaf0719f226f732c8a7a08462234650f106f Mon Sep 17 00:00:00 2001 From: Hillel Date: Wed, 14 Oct 2026 15:03:57 -0700 Subject: [PATCH 1/2] Update pastes.sh raw logging to match non-raw. --- pkg/apps/pastes/api.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/apps/pastes/api.go b/pkg/apps/pastes/api.go index 75e7c609..e2a36354 100644 --- a/pkg/apps/pastes/api.go +++ b/pkg/apps/pastes/api.go @@ -137,7 +137,7 @@ func (web *webRouter) blogHandler(w http.ResponseWriter, r *http.Request) { err = ts.Execute(w, data) if err != nil { - logger.Error("could not execute tempalte", "err", err) + logger.Error("could not execute template", "err", err) http.Error(w, err.Error(), http.StatusInternalServerError) } } @@ -165,8 +165,8 @@ func (web *webRouter) postHandler(w http.ResponseWriter, r *http.Request) { user, err := dbpool.FindUserByName(username) if err != nil { - logger.Info("paste not found") - http.Error(w, "paste not found", http.StatusNotFound) + logger.Info("user not found") + http.Error(w, "user not found", http.StatusNotFound) return } logger = shared.LoggerWithUser(logger, user) @@ -258,7 +258,7 @@ func (web *webRouter) postHandlerRaw(w http.ResponseWriter, r *http.Request) { dbpool := web.db blogger := web.cfg.Logger - logger := blogger.With("user", username, "slug", slug) + logger := blogger.With("slug", slug, "user", username) user, err := dbpool.FindUserByName(username) if err != nil { @@ -266,7 +266,7 @@ func (web *webRouter) postHandlerRaw(w http.ResponseWriter, r *http.Request) { http.Error(w, "user not found", http.StatusNotFound) return } - logger = shared.LoggerWithUser(blogger, user) + logger = shared.LoggerWithUser(logger, user) post, err := dbpool.FindPostWithSlug(slug, user.ID, cfg.Space) if err != nil { From 163b7a1c1e64508e978f22e5c4aa16d3f73bc76c Mon Sep 17 00:00:00 2001 From: Hillel Date: Wed, 14 Oct 2026 15:32:46 -0700 Subject: [PATCH 2/2] Don't duplicate user in logs --- pkg/apps/pastes/api.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/apps/pastes/api.go b/pkg/apps/pastes/api.go index e2a36354..f758e599 100644 --- a/pkg/apps/pastes/api.go +++ b/pkg/apps/pastes/api.go @@ -75,16 +75,16 @@ func (web *webRouter) blogHandler(w http.ResponseWriter, r *http.Request) { username := router.GetUsernameFromRequest(r) dbpool := web.db blogger := web.cfg.Logger - logger := blogger.With("user", username) + logger := blogger.With() cfg := web.cfg user, err := dbpool.FindUserByName(username) if err != nil { - logger.Info("user not found") + logger.Info("user not found", "user", username) http.Error(w, "user not found", http.StatusNotFound) return } - logger = shared.LoggerWithUser(blogger, user) + logger = shared.LoggerWithUser(logger, user) pager, err := dbpool.FindPostsByUser(&db.Pager{Num: 1000, Page: 0}, user.ID, cfg.Space) if err != nil { @@ -161,11 +161,11 @@ func (web *webRouter) postHandler(w http.ResponseWriter, r *http.Request) { dbpool := web.db blogger := web.cfg.Logger - logger := blogger.With("slug", slug, "user", username) + logger := blogger.With("slug", slug) user, err := dbpool.FindUserByName(username) if err != nil { - logger.Info("user not found") + logger.Info("user not found", "user", username) http.Error(w, "user not found", http.StatusNotFound) return } @@ -258,11 +258,11 @@ func (web *webRouter) postHandlerRaw(w http.ResponseWriter, r *http.Request) { dbpool := web.db blogger := web.cfg.Logger - logger := blogger.With("slug", slug, "user", username) + logger := blogger.With("slug", slug) user, err := dbpool.FindUserByName(username) if err != nil { - logger.Info("user not found") + logger.Info("user not found", "user", username) http.Error(w, "user not found", http.StatusNotFound) return }