From 803f195af1bccd215f000837087d4d09dc0a645d Mon Sep 17 00:00:00 2001
From: Huxley <dhao2001@outlook.com>
Date: Mon, 6 Jul 2026 00:11:06 +0800
Subject: [PATCH] refactor: rename internal/log to internal/logging to avoid
 stdlib shadowing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- refactor: rename `internal/log` → `internal/logging`, package `log` →
  `logging`
- refactor: update imports in `cmd/serve.go` and
  `internal/middleware/requestid.go`
---
 cmd/serve.go                         | 4 ++--
 internal/{log => logging}/context.go | 2 +-
 internal/{log => logging}/logger.go  | 2 +-
 internal/middleware/requestid.go     | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename internal/{log => logging}/context.go (98%)
 rename internal/{log => logging}/logger.go (99%)

diff --git a/cmd/serve.go b/cmd/serve.go
index 2426de5..fa58a22 100644
--- a/cmd/serve.go
+++ b/cmd/serve.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/dhao2001/mygo/internal/app"
 	"github.com/dhao2001/mygo/internal/config"
-	mygolog "github.com/dhao2001/mygo/internal/log"
+	"github.com/dhao2001/mygo/internal/logging"
 	"github.com/dhao2001/mygo/internal/server"
 )
 
@@ -29,7 +29,7 @@ var serveCmd = &cobra.Command{
 		}
 
 		// Set up structured logging before anything else.
-		appLogger := mygolog.NewLogger(cfg.Log)
+		appLogger := logging.NewLogger(cfg.Log)
 		slog.SetDefault(appLogger)
 		slog.Info("mygo server starting")
 		if loadInfo.EphemeralJWTSecret {
diff --git a/internal/log/context.go b/internal/logging/context.go
similarity index 98%
rename from internal/log/context.go
rename to internal/logging/context.go
index 99f6082..83ba33a 100644
--- a/internal/log/context.go
+++ b/internal/logging/context.go
@@ -1,4 +1,4 @@
-package log
+package logging
 
 import (
 	"context"
diff --git a/internal/log/logger.go b/internal/logging/logger.go
similarity index 99%
rename from internal/log/logger.go
rename to internal/logging/logger.go
index dfed508..4f3c96f 100644
--- a/internal/log/logger.go
+++ b/internal/logging/logger.go
@@ -1,4 +1,4 @@
-package log
+package logging
 
 import (
 	"context"
diff --git a/internal/middleware/requestid.go b/internal/middleware/requestid.go
index 2507291..1f86379 100644
--- a/internal/middleware/requestid.go
+++ b/internal/middleware/requestid.go
@@ -4,7 +4,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
 
-	mygolog "github.com/dhao2001/mygo/internal/log"
+	"github.com/dhao2001/mygo/internal/logging"
 )
 
 // RequestID returns a Gin middleware that ensures every request has a
@@ -19,7 +19,7 @@ func RequestID() gin.HandlerFunc {
 		}
 
 		// Inject into Go context for slog.*Context calls.
-		c.Request = c.Request.WithContext(mygolog.WithRequestID(c.Request.Context(), reqID))
+		c.Request = c.Request.WithContext(logging.WithRequestID(c.Request.Context(), reqID))
 
 		// Also set in Gin context for direct access.
 		c.Set("req_id", reqID)