From d8c7427eb29a7df0d7d93fe7e33b1be1bdf885a6 Mon Sep 17 00:00:00 2001 From: Angel Beltran Date: Sat, 24 Jan 2026 13:29:32 -0700 Subject: [PATCH] cleaned up unused middleware --- internal/server/middleware/chain.go | 16 ------ internal/server/middleware/log.go | 86 ----------------------------- 2 files changed, 102 deletions(-) delete mode 100644 internal/server/middleware/chain.go delete mode 100644 internal/server/middleware/log.go diff --git a/internal/server/middleware/chain.go b/internal/server/middleware/chain.go deleted file mode 100644 index 350a21d..0000000 --- a/internal/server/middleware/chain.go +++ /dev/null @@ -1,16 +0,0 @@ -package middleware - -import ( - "ruben/inventory2/internal/server/response" -) - -func Chain(ms ...response.Middleware) response.Middleware { - return func(fn response.HandlerFunc) response.HandlerFunc { - res := fn - for _, m := range ms { - prev := res - res = m(prev) - } - return res - } -} diff --git a/internal/server/middleware/log.go b/internal/server/middleware/log.go deleted file mode 100644 index 2240dfb..0000000 --- a/internal/server/middleware/log.go +++ /dev/null @@ -1,86 +0,0 @@ -package middleware - -import ( - "context" - "net/http" - "time" - - "ruben/inventory2/internal/logging" - "ruben/inventory2/internal/server/response" - - "github.com/gin-gonic/gin" -) - -// TODO: make this GIN compatible -func LogRequests(ctx context.Context, logger *logging.Logger) response.Middleware { - reqIDCh := newRequestIDProvider(ctx) - - return func(fn response.HandlerFunc) response.HandlerFunc { - return func(c *gin.Context) (response.Response, error) { - start := time.Now() - - r := c.Request - args := []any{ - "id", <-reqIDCh, - "url", r.URL, - "method", r.Method, - } - - logger.Debug("Request", args...) - - res, err := fn(c) - end := time.Now() - - var status int - if err != nil { - status = response.GetStatusFromError(err) - } else { - var ok bool - if status, ok = res.GetStatus(); !ok { - status = http.StatusOK - } - } - - args = append(args, - "status", status, - "elapsed", time.Duration(end.UnixNano()-start.UnixNano()), - ) - - switch status / 100 { - case 1: - logger.Debug("Response", args...) - case 2: - logger.Debug("Response", args...) - case 3: - logger.Debug("Response", args...) - case 4: - logger.Warn("Response", args...) - default: - logger.Error("Response", args...) - } - - return res, err - } - } -} - -func newRequestIDProvider(ctx context.Context) <-chan int { - reqIDCh := make(chan int) - - go func() { - defer close(reqIDCh) - - nextReqID := 1 - - for { - select { - case reqIDCh <- nextReqID: - nextReqID += 1 - case <-ctx.Done(): - return - } - } - }() - - return reqIDCh -}