diff --git a/cmd/lfsd/auth.go b/cmd/lfsd/auth.go index 9d1dbeb..f36ce04 100644 --- a/cmd/lfsd/auth.go +++ b/cmd/lfsd/auth.go @@ -12,14 +12,13 @@ import ( "github.com/cockroachdb/errors" "github.com/flamego/cache" "github.com/flamego/flamego" + "unknwon.dev/x/logx" "unknwon.dev/git-lfs-server/internal/forge" - "unknwon.dev/git-lfs-server/internal/logx" ) -func authorize(forges map[string]forge.Provider) flamego.Handler { - return func(c flamego.Context, logger *logx.Logger, cache cache.Cache) { - logger = logger.Scoped("authorize") +func authorize(logger *logx.Logger, forges map[string]forge.Provider) flamego.Handler { + return func(c flamego.Context, cache cache.Cache) { ctx := c.Request().Context() host := hostFromContext(c) diff --git a/cmd/lfsd/lfs.go b/cmd/lfsd/lfs.go index f35aa73..3709b93 100644 --- a/cmd/lfsd/lfs.go +++ b/cmd/lfsd/lfs.go @@ -14,11 +14,11 @@ import ( "github.com/cockroachdb/errors" "github.com/flamego/flamego" + "unknwon.dev/x/logx" "unknwon.dev/git-lfs-server/internal/database" "unknwon.dev/git-lfs-server/internal/forge" "unknwon.dev/git-lfs-server/internal/iox" - "unknwon.dev/git-lfs-server/internal/logx" "unknwon.dev/git-lfs-server/internal/ptrx" "unknwon.dev/git-lfs-server/internal/storage" ) @@ -77,9 +77,8 @@ type verifyRequest struct { Size int64 `json:"size"` } -func serveBatch(db *database.DB, externalURL string, maxObjectSize int64) flamego.Handler { - return func(c flamego.Context, logger *logx.Logger, perm forge.Permission) { - logger = logger.Scoped("batch") +func serveBatch(logger *logx.Logger, db *database.DB, externalURL string, maxObjectSize int64) flamego.Handler { + return func(c flamego.Context, perm forge.Permission) { ctx := c.Request().Context() body := http.MaxBytesReader(c.ResponseWriter(), c.Request().Body().ReadCloser(), maxJSONRequestBytes) @@ -210,9 +209,8 @@ func serveBatch(db *database.DB, externalURL string, maxObjectSize int64) flameg } } -func serveUpload(db *database.DB, storages map[string]storage.Backend, maxObjectSize int64) flamego.Handler { - return func(c flamego.Context, logger *logx.Logger, perm forge.Permission) { - logger = logger.Scoped("upload") +func serveUpload(logger *logx.Logger, db *database.DB, storages map[string]storage.Backend, maxObjectSize int64) flamego.Handler { + return func(c flamego.Context, perm forge.Permission) { ctx := c.Request().Context() if perm != forge.PermissionWrite { @@ -330,9 +328,8 @@ func serveUploadPresign(c flamego.Context, logger *logx.Logger, db *database.DB, w.WriteHeader(http.StatusTemporaryRedirect) } -func serveDownload(db *database.DB, storages map[string]storage.Backend) flamego.Handler { - return func(c flamego.Context, logger *logx.Logger, perm forge.Permission) { - logger = logger.Scoped("download") +func serveDownload(logger *logx.Logger, db *database.DB, storages map[string]storage.Backend) flamego.Handler { + return func(c flamego.Context, perm forge.Permission) { ctx := c.Request().Context() if perm != forge.PermissionRead && perm != forge.PermissionWrite { @@ -425,9 +422,8 @@ func serveDownloadPresign(c flamego.Context, logger *logx.Logger, backend storag w.WriteHeader(http.StatusTemporaryRedirect) } -func serveVerify(db *database.DB, storages map[string]storage.Backend) flamego.Handler { - return func(c flamego.Context, logger *logx.Logger, perm forge.Permission) { - logger = logger.Scoped("verify") +func serveVerify(logger *logx.Logger, db *database.DB, storages map[string]storage.Backend) flamego.Handler { + return func(c flamego.Context, perm forge.Permission) { ctx := c.Request().Context() if perm != forge.PermissionWrite { diff --git a/cmd/lfsd/logging.go b/cmd/lfsd/logging.go index d9b8cc2..0c44387 100644 --- a/cmd/lfsd/logging.go +++ b/cmd/lfsd/logging.go @@ -4,12 +4,12 @@ import ( "log/slog" "os" "strings" + "time" "charm.land/lipgloss/v2" charmlog "charm.land/log/v2" "github.com/flamego/flamego" - - "unknwon.dev/git-lfs-server/internal/logx" + "unknwon.dev/x/logx" ) func parseLevel(s string) slog.Level { @@ -28,6 +28,7 @@ func parseLevel(s string) slog.Level { func setupLogging(cfg LogConfig) *logx.Logger { level := parseLevel(cfg.Level) opts := charmlog.Options{ + TimeFormat: time.DateTime, Level: charmlog.Level(level), ReportTimestamp: true, } diff --git a/cmd/lfsd/main.go b/cmd/lfsd/main.go index 30e6048..fad9966 100644 --- a/cmd/lfsd/main.go +++ b/cmd/lfsd/main.go @@ -12,11 +12,11 @@ import ( "github.com/flamego/cache" "github.com/flamego/flamego" "github.com/sourcegraph/conc" + "unknwon.dev/x/logx" "unknwon.dev/git-lfs-server/internal/database" "unknwon.dev/git-lfs-server/internal/forge" "unknwon.dev/git-lfs-server/internal/janitor" - "unknwon.dev/git-lfs-server/internal/logx" "unknwon.dev/git-lfs-server/internal/strx" ) @@ -54,18 +54,17 @@ func main() { } f := flamego.New() - f.Map(logger) f.Use(flamego.Recovery()) f.Use(cache.Cacher()) - f.Get("/healthz", serveHealthz(db)) + f.Get("/healthz", serveHealthz(logger.Scoped("healthz"), db)) f.Group("/{host}/{**}/info/lfs/objects", func() { - f.Post("/batch", serveBatch(db, config.Server.ExternalURL, config.Server.MaxObjectSize)) - f.Get("/{oid}", serveDownload(db, config.Storages)) - f.Put("/{oid}", serveUpload(db, config.Storages, config.Server.MaxObjectSize)) - f.Post("/verify", serveVerify(db, config.Storages)) - }, authorize(config.Forges)) + f.Post("/batch", serveBatch(logger.Scoped("batch"), db, config.Server.ExternalURL, config.Server.MaxObjectSize)) + f.Get("/{oid}", serveDownload(logger.Scoped("download"), db, config.Storages)) + f.Put("/{oid}", serveUpload(logger.Scoped("upload"), db, config.Storages, config.Server.MaxObjectSize)) + f.Post("/verify", serveVerify(logger.Scoped("verify"), db, config.Storages)) + }, authorize(logger.Scoped("authorize"), config.Forges)) ctx, stop := signal.NotifyContext(ctx, syscall.SIGINT, syscall.SIGTERM) defer stop() @@ -110,8 +109,8 @@ func repoNameFromContext(c flamego.Context) string { return strings.ToLower(c.Param("host") + "/" + c.Param("**")) } -func serveHealthz(db *database.DB) flamego.Handler { - return func(c flamego.Context, logger *logx.Logger) { +func serveHealthz(logger *logx.Logger, db *database.DB) flamego.Handler { + return func(c flamego.Context) { if err := db.Ping(c.Request().Context()); err != nil { logger.ErrorContext(c.Request().Context(), "Health check failed", "error", err) http.Error(c.ResponseWriter(), http.StatusText(http.StatusServiceUnavailable), http.StatusServiceUnavailable) diff --git a/go.mod b/go.mod index 4960c02..2c4fbdc 100644 --- a/go.mod +++ b/go.mod @@ -20,6 +20,7 @@ require ( gorm.io/driver/postgres v1.6.0 gorm.io/gorm v1.31.1 unknwon.dev/ini/v2 v2.0.0-beta.4 + unknwon.dev/x v0.0.0-20261031163318-04af03672776 ) require ( diff --git a/go.sum b/go.sum index 814fd35..10becac 100644 --- a/go.sum +++ b/go.sum @@ -243,3 +243,5 @@ mvdan.cc/gofumpt v0.5.0 h1:0EQ+Z56k8tXjj/6TQD25BFNKQXpCvT0rnansIc7Ug5E= mvdan.cc/gofumpt v0.5.0/go.mod h1:HBeVDtMKRZpXyxFciAirzdKklDlGu8aAy1wEbH5Y9js= unknwon.dev/ini/v2 v2.0.0-beta.4 h1:W1mOu7vP8QCdq1b6rDFzYmzZs/vQ4FCIRbQVgZ82z3U= unknwon.dev/ini/v2 v2.0.0-beta.4/go.mod h1:pEeiEmFhx52IIFUwFqZcepgj8i3AFkxt9yDO4xHK45w= +unknwon.dev/x v0.0.0-20261031163318-04af03672776 h1:YgwMANcGpGe2INBIj1OViR9S5v3gIXC0179kiTw0hwY= +unknwon.dev/x v0.0.0-20261031163318-04af03672776/go.mod h1:Ks814GgzihBUdNtUs73mudIRE+tENn+SqjdvJsXLLGA= diff --git a/internal/database/database.go b/internal/database/database.go index 8b8eb16..7ba0d30 100644 --- a/internal/database/database.go +++ b/internal/database/database.go @@ -9,8 +9,7 @@ import ( "github.com/cockroachdb/errors" "gorm.io/driver/postgres" "gorm.io/gorm" - - "unknwon.dev/git-lfs-server/internal/logx" + "unknwon.dev/x/logx" ) // Config holds PostgreSQL connection and pool settings. The ConnMaxLifetime and diff --git a/internal/database/logger.go b/internal/database/logger.go index 7500e7c..b18cfc6 100644 --- a/internal/database/logger.go +++ b/internal/database/logger.go @@ -5,8 +5,7 @@ import ( "time" gormlogger "gorm.io/gorm/logger" - - "unknwon.dev/git-lfs-server/internal/logx" + "unknwon.dev/x/logx" ) // logxWriter adapts *logx.Logger to GORM's logger.Writer interface so that diff --git a/internal/forge/forge.go b/internal/forge/forge.go index f06067e..ffd1b3a 100644 --- a/internal/forge/forge.go +++ b/internal/forge/forge.go @@ -6,8 +6,7 @@ import ( "time" "github.com/cockroachdb/errors" - - "unknwon.dev/git-lfs-server/internal/logx" + "unknwon.dev/x/logx" ) // Type identifies a forge implementation. The value is used in ini diff --git a/internal/forge/github.go b/internal/forge/github.go index 5e9ed5c..7caefac 100644 --- a/internal/forge/github.go +++ b/internal/forge/github.go @@ -8,8 +8,7 @@ import ( "time" "github.com/cockroachdb/errors" - - "unknwon.dev/git-lfs-server/internal/logx" + "unknwon.dev/x/logx" ) var _ Provider = (*GitHubProvider)(nil) diff --git a/internal/forge/github_test.go b/internal/forge/github_test.go index e7ef76c..ede724c 100644 --- a/internal/forge/github_test.go +++ b/internal/forge/github_test.go @@ -6,8 +6,7 @@ import ( "time" "github.com/stretchr/testify/assert" - - "unknwon.dev/git-lfs-server/internal/logx" + "unknwon.dev/x/logx" ) func TestGitHubTokenTTL(t *testing.T) { diff --git a/internal/forge/gitlab.go b/internal/forge/gitlab.go index 0f77da3..f6ec155 100644 --- a/internal/forge/gitlab.go +++ b/internal/forge/gitlab.go @@ -9,8 +9,7 @@ import ( "time" "github.com/cockroachdb/errors" - - "unknwon.dev/git-lfs-server/internal/logx" + "unknwon.dev/x/logx" ) var _ Provider = (*GitLabProvider)(nil) diff --git a/internal/forge/gitlab_test.go b/internal/forge/gitlab_test.go index 35a1e7d..d0785c4 100644 --- a/internal/forge/gitlab_test.go +++ b/internal/forge/gitlab_test.go @@ -10,8 +10,7 @@ import ( "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - - "unknwon.dev/git-lfs-server/internal/logx" + "unknwon.dev/x/logx" ) func TestGitLabSmartHTTPURL(t *testing.T) { diff --git a/internal/janitor/janitor.go b/internal/janitor/janitor.go index c8db2a0..e122f3c 100644 --- a/internal/janitor/janitor.go +++ b/internal/janitor/janitor.go @@ -6,9 +6,9 @@ import ( "time" "github.com/cockroachdb/errors" + "unknwon.dev/x/logx" "unknwon.dev/git-lfs-server/internal/database" - "unknwon.dev/git-lfs-server/internal/logx" "unknwon.dev/git-lfs-server/internal/ptrx" "unknwon.dev/git-lfs-server/internal/storage" ) diff --git a/internal/logx/logger.go b/internal/logx/logger.go deleted file mode 100644 index 81a8bf7..0000000 --- a/internal/logx/logger.go +++ /dev/null @@ -1,47 +0,0 @@ -package logx - -import ( - "context" - "io" - "log/slog" - "os" -) - -// Logger wraps *slog.Logger with scoping and builder methods that preserve the -// Logger type. -type Logger struct { - *slog.Logger -} - -// New creates a Logger backed by the given handler. -func New(h slog.Handler) *Logger { - return &Logger{Logger: slog.New(h)} -} - -// NewNoopLogger creates a Logger that discards all output. -func NewNoopLogger() *Logger { - return New(slog.NewTextHandler(io.Discard, nil)) -} - -// Scoped returns a child logger whose messages are prefixed with "[name] ". -func (l *Logger) Scoped(name string) *Logger { - return New(newPrefixHandler("["+name+"] ", l.Handler())) -} - -// With returns a child logger that includes the given attributes in every -// record. -func (l *Logger) With(args ...any) *Logger { - return &Logger{Logger: l.Logger.With(args...)} -} - -// WithGroup returns a child logger that nests subsequent attributes under the -// given group name. -func (l *Logger) WithGroup(name string) *Logger { - return &Logger{Logger: l.Logger.WithGroup(name)} -} - -// FatalContext logs at error level and exits the process with status code 1. -func (l *Logger) FatalContext(ctx context.Context, msg string, args ...any) { - l.ErrorContext(ctx, msg, args...) - os.Exit(1) -} diff --git a/internal/logx/prefix_handler.go b/internal/logx/prefix_handler.go deleted file mode 100644 index 5c28aee..0000000 --- a/internal/logx/prefix_handler.go +++ /dev/null @@ -1,36 +0,0 @@ -package logx - -import ( - "context" - "log/slog" -) - -// prefixHandler wraps a slog.Handler and prepends a fixed prefix to every -// record's message. Used by Logger.Scoped to add component context without -// relying on attribute grouping. -type prefixHandler struct { - prefix string - handler slog.Handler -} - -func newPrefixHandler(prefix string, handler slog.Handler) *prefixHandler { - return &prefixHandler{prefix: prefix, handler: handler} -} - -func (h *prefixHandler) Enabled(ctx context.Context, level slog.Level) bool { - return h.handler.Enabled(ctx, level) -} - -func (h *prefixHandler) Handle(ctx context.Context, r slog.Record) error { - r2 := r.Clone() - r2.Message = h.prefix + r2.Message - return h.handler.Handle(ctx, r2) -} - -func (h *prefixHandler) WithAttrs(attrs []slog.Attr) slog.Handler { - return newPrefixHandler(h.prefix, h.handler.WithAttrs(attrs)) -} - -func (h *prefixHandler) WithGroup(name string) slog.Handler { - return newPrefixHandler(h.prefix, h.handler.WithGroup(name)) -}