diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-09-14 10:01:23 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-09-15 13:37:43 +0300 |
| commit | 214d0ff9641c85d71de337f1f2f58d5c6c2dce7b (patch) | |
| tree | db1d3f619af3849029fe44f8ec259947b9f06bd5 /internal/gitaly/service/repository/apply_gitattributes.go | |
| parent | 2a006c4ee8b47887ddc1274dab9f645caf679c41 (diff) | |
log: Encapsulate our use of the `ctxlogrus` package
The `ctxlogrus` package is about to go away. Let's encapsulate it so
that the transition will become easier for us at a later point.
Diffstat (limited to 'internal/gitaly/service/repository/apply_gitattributes.go')
| -rw-r--r-- | internal/gitaly/service/repository/apply_gitattributes.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/internal/gitaly/service/repository/apply_gitattributes.go b/internal/gitaly/service/repository/apply_gitattributes.go index 131d961ee..e0095678e 100644 --- a/internal/gitaly/service/repository/apply_gitattributes.go +++ b/internal/gitaly/service/repository/apply_gitattributes.go @@ -8,12 +8,12 @@ import ( "os" "path/filepath" - "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" "gitlab.com/gitlab-org/gitaly/v16/internal/git" "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" "gitlab.com/gitlab-org/gitaly/v16/internal/helper/perm" + "gitlab.com/gitlab-org/gitaly/v16/internal/log" "gitlab.com/gitlab-org/gitaly/v16/internal/safe" "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" @@ -55,7 +55,7 @@ func (s *server) applyGitattributes(ctx context.Context, repo *localrepo.Repo, o } defer func() { if err := locker.Close(); err != nil { - ctxlogrus.Extract(ctx).WithError(err).Error("unlocking gitattributes") + log.FromContext(ctx).WithError(err).Error("unlocking gitattributes") } }() |