Commit 88a80a1

mo khan <mo@mokhan.ca>
2025-04-04 22:21:09
refactor: rename middleware to HTTP
1 parent 9c3c4f7
Changed files (2)
pkg/log/middleware.go → pkg/log/http.go
@@ -7,7 +7,7 @@ import (
 	"github.com/rs/zerolog"
 )
 
-func Middleware(logger *zerolog.Logger) func(http.Handler) http.Handler {
+func HTTP(logger *zerolog.Logger) func(http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			ctx := logger.WithContext(r.Context())
pkg/log/log_test.go
@@ -4,7 +4,6 @@ import (
 	"bufio"
 	"bytes"
 	"context"
-	"fmt"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -53,12 +52,11 @@ func TestLog(t *testing.T) {
 		assert.Equal(t, "127.0.0.1", items["ip"])
 	})
 
-	t.Run("WithMiddleware", func(t *testing.T) {
+	t.Run("HTTP", func(t *testing.T) {
 		var b bytes.Buffer
 		writer := bufio.NewWriter(&b)
-		log := New(writer, Fields{"env": "test"})
-
-		server := httptest.NewServer(Middleware(log)(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		log := New(writer, Fields{})
+		server := httptest.NewServer(HTTP(log)(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			w.WriteHeader(http.StatusTeapot)
 		})))
 		defer server.Close()
@@ -71,10 +69,6 @@ func TestLog(t *testing.T) {
 		items, err := serde.FromJSON[map[string]interface{}](bufio.NewReader(&b))
 		require.NoError(t, err)
 
-		fmt.Printf("%v\n", items)
-		assert.Equal(t, "test", items["env"])
-		assert.Equal(t, "debug", items["level"])
-		assert.NotEmpty(t, items["time"])
 		assert.Equal(t, float64(http.StatusTeapot), items["status"])
 		assert.Equal(t, "GET", items["method"])
 		assert.Equal(t, "/", items["path"])