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:
authorStan Hu <stanhu@gmail.com>2020-12-12 19:21:17 +0300
committerStan Hu <stanhu@gmail.com>2020-12-12 19:21:17 +0300
commit425e29c3003ef12b99c4cbf33177fb9133308a17 (patch)
tree47a06dc30dee0157b1ee74a88e1cc2c7135b0028
parent67cf6564bcec8b7a34860a47247e95a4c6cf04cb (diff)
Move log context fields out of CreateForksh-support-local-fork
This centralizes the logging in cloneCommand().
-rw-r--r--internal/gitaly/service/repository/fork.go14
1 files changed, 7 insertions, 7 deletions
diff --git a/internal/gitaly/service/repository/fork.go b/internal/gitaly/service/repository/fork.go
index bcc76e6b2..4a19a281a 100644
--- a/internal/gitaly/service/repository/fork.go
+++ b/internal/gitaly/service/repository/fork.go
@@ -42,13 +42,6 @@ func (s *server) CreateFork(ctx context.Context, req *gitalypb.CreateForkRequest
return nil, err
}
- ctxlogrus.AddFields(ctx, logrus.Fields{
- "source_storage": sourceRepository.GetStorageName(),
- "source_path": sourceRepository.GetRelativePath(),
- "target_storage": targetRepository.GetStorageName(),
- "target_path": targetRepository.GetRelativePath(),
- })
-
objectPool, sourceObjectPoolPath, err := s.getObjectPool(req)
if err != nil {
return nil, err
@@ -162,6 +155,13 @@ func (s *server) getObjectPool(req *gitalypb.CreateForkRequest) (*objectpool.Obj
}
func (s *server) cloneCommand(a commandArgs) (*command.Command, error) {
+ ctxlogrus.AddFields(a.ctx, logrus.Fields{
+ "source_storage": a.sourceRepository.GetStorageName(),
+ "source_path": a.sourceRepository.GetRelativePath(),
+ "target_storage": a.targetRepository.GetStorageName(),
+ "target_path": a.targetRepository.GetRelativePath(),
+ })
+
flags := []git.Option{
git.Flag{Name: "--bare"},
}