Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Fargher <jfargher@gitlab.com>2022-03-21 07:11:13 +0300
committerJames Fargher <jfargher@gitlab.com>2022-03-31 01:27:17 +0300
commit50b8de6bbf1da2f24896a8c7e2b7575e5ba644f8 (patch)
tree642d42ea4dbbc7f76e33c9ba7ffee337e0704bd7
parent2606b45695ab42235cb2a56cfd957b7d24d209d7 (diff)
gitaly-git2go: Add a logger to context
-rw-r--r--cmd/gitaly-git2go-v14/main.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/cmd/gitaly-git2go-v14/main.go b/cmd/gitaly-git2go-v14/main.go
index 39cb817cc..c7110b32b 100644
--- a/cmd/gitaly-git2go-v14/main.go
+++ b/cmd/gitaly-git2go-v14/main.go
@@ -10,6 +10,7 @@ import (
"fmt"
"os"
+ "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus"
git "github.com/libgit2/git2go/v33"
"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
glog "gitlab.com/gitlab-org/gitaly/v14/internal/log"
@@ -88,7 +89,9 @@ func main() {
fatalf(encoder, "enable fsync: %s", err)
}
- if err := subcmd.Run(context.Background(), decoder, encoder); err != nil {
+ ctx := ctxlogrus.ToContext(context.Background(), glog.Default())
+
+ if err := subcmd.Run(ctx, decoder, encoder); err != nil {
fatalf(encoder, "%s: %s", subcmdFlags.Name(), err)
}
}