From 425e29c3003ef12b99c4cbf33177fb9133308a17 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Sat, 12 Dec 2020 08:21:17 -0800 Subject: Move log context fields out of CreateFork This centralizes the logging in cloneCommand(). --- internal/gitaly/service/repository/fork.go | 14 +++++++------- 1 file 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"}, } -- cgit v1.2.3