Clean out Get/SetRequestLogger from apiutil

1 files changed, 26 insertions, 10 deletions

diff --git a/src/http/assets.go b/src/http/assets.go
index 8f43074..09cbf06 100644
--- a/src/http/assets.go
+++ b/src/http/assets.go
@@ -3,7 +3,6 @@ package http
 import (
 	"bytes"
 	"errors"
-	"fmt"
 	"net/http"
 	"path/filepath"
 	"strings"
@@ -23,10 +22,16 @@ func (a *api) managePostAssetsHandler() http.Handler {
 func (a *api) getPostAssetHandler() http.Handler {
 
 	return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
+		var (
+			ctx    = r.Context()
+			logger = a.params.Logger
+		)
 
 		maxWidth, err := apiutil.StrToInt(r.FormValue("w"), 0)
 		if err != nil {
-			apiutil.BadRequest(rw, r, fmt.Errorf("invalid w parameter: %w", err))
+			apiutil.BadRequest(
+				ctx, logger, rw, "invalid w parameter: %w", err,
+			)
 			return
 		}
 
@@ -53,7 +58,7 @@ func (a *api) getPostAssetHandler() http.Handler {
 
 		} else if err != nil {
 			apiutil.InternalServerError(
-				rw, r, fmt.Errorf("fetching asset at path %q: %w", path, err),
+				ctx, logger, rw, "fetching asset at path %q: %w", path, err,
 			)
 			return
 		}
@@ -67,22 +72,30 @@ func (a *api) getPostAssetHandler() http.Handler {
 func (a *api) postPostAssetHandler() http.Handler {
 
 	return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
+		var (
+			ctx    = r.Context()
+			logger = a.params.Logger
+		)
 
 		id := r.PostFormValue("id")
 		if id == "" {
-			apiutil.BadRequest(rw, r, errors.New("id is required"))
+			apiutil.BadRequest(ctx, logger, rw, "id is required")
 			return
 		}
 
 		file, _, err := r.FormFile("file")
 		if err != nil {
-			apiutil.BadRequest(rw, r, fmt.Errorf("reading multipart file: %w", err))
+			apiutil.BadRequest(
+				ctx, logger, rw, "reading multipart file: %w", err,
+			)
 			return
 		}
 		defer file.Close()
 
 		if err := a.params.PostAssetStore.Set(id, file); err != nil {
-			apiutil.InternalServerError(rw, r, fmt.Errorf("storing file: %w", err))
+			apiutil.InternalServerError(
+				ctx, logger, rw, "storing file: %w", err,
+			)
 			return
 		}
 
@@ -95,11 +108,14 @@ func (a *api) postPostAssetHandler() http.Handler {
 func (a *api) deletePostAssetHandler() http.Handler {
 
 	return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
-
-		id := filepath.Base(r.URL.Path)
+		var (
+			ctx    = r.Context()
+			logger = a.params.Logger
+			id     = filepath.Base(r.URL.Path)
+		)
 
 		if id == "/" {
-			apiutil.BadRequest(rw, r, errors.New("id is required"))
+			apiutil.BadRequest(ctx, logger, rw, "id is required")
 			return
 		}
 
@@ -110,7 +126,7 @@ func (a *api) deletePostAssetHandler() http.Handler {
 			return
 		} else if err != nil {
 			apiutil.InternalServerError(
-				rw, r, fmt.Errorf("deleting asset with id %q: %w", id, err),
+				ctx, logger, rw, "deleting asset with id %q: %w", id, err,
 			)
 			return
 		}