diff options
| author | Igor Drozdov <idrozdov@gitlab.com> | 2020-07-31 12:58:42 +0000 |
|---|---|---|
| committer | Igor Drozdov <idrozdov@gitlab.com> | 2020-07-31 12:58:42 +0000 |
| commit | e0a8b72bc3a9dbfcbe4d32be08f66efb12f24bcd (patch) | |
| tree | 6a28feda2a62ec88e889593d7fbf3ae950659e35 /internal/command/uploadpack | |
| parent | 701ebca0b5d4a8451afe677c3bdb19cc92a5a2f0 (diff) | |
| parent | 87402ed127d9855b8123e5e08a4c89d373cc79e8 (diff) | |
| download | gitlab-shell-e0a8b72bc3a9dbfcbe4d32be08f66efb12f24bcd.tar.gz | |
Merge branch 'sh-inject-and-log-correlation-di' into 'master'
Generate and log correlation IDs
See merge request gitlab-org/gitlab-shell!400
Diffstat (limited to 'internal/command/uploadpack')
| -rw-r--r-- | internal/command/uploadpack/gitalycall.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/internal/command/uploadpack/gitalycall.go b/internal/command/uploadpack/gitalycall.go index c15ef38..ba0fef2 100644 --- a/internal/command/uploadpack/gitalycall.go +++ b/internal/command/uploadpack/gitalycall.go @@ -29,11 +29,9 @@ func (c *Command) performGitalyCall(response *accessverifier.Response) error { } return gc.RunGitalyCommand(func(ctx context.Context, conn *grpc.ClientConn) (int32, error) { - ctx, cancel := context.WithCancel(ctx) + ctx, cancel := gc.PrepareContext(ctx, request.Repository, response, request.GitProtocol) defer cancel() - gc.LogExecution(request.Repository, response, request.GitProtocol) - rw := c.ReadWriter return client.UploadPack(ctx, conn, rw.In, rw.Out, rw.ErrOut, request) }) |