Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions cmd/lfsd/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
22 changes: 9 additions & 13 deletions cmd/lfsd/lfs.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
5 changes: 3 additions & 2 deletions cmd/lfsd/logging.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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,
}
Expand Down
19 changes: 9 additions & 10 deletions cmd/lfsd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
3 changes: 1 addition & 2 deletions internal/database/database.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions internal/database/logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions internal/forge/forge.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions internal/forge/github.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions internal/forge/github_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
3 changes: 1 addition & 2 deletions internal/forge/gitlab.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions internal/forge/gitlab_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion internal/janitor/janitor.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
47 changes: 0 additions & 47 deletions internal/logx/logger.go

This file was deleted.

36 changes: 0 additions & 36 deletions internal/logx/prefix_handler.go

This file was deleted.

Loading