diff options
author | Máximo Cuadros <mcuadros@gmail.com> | 2017-07-25 16:14:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-25 16:14:32 +0200 |
commit | fbf2a4ab4588c78e3d9d0265dba774ae6b388b5f (patch) | |
tree | 883e9172499234f9f258fb41190fcd0f9134c0a4 /plumbing/transport/internal/common/common.go | |
parent | 25a0420bc0544f826e5517365e986d83bbb926c8 (diff) | |
parent | db5fa522f36207684ec0d67b98cac6313f0259b6 (diff) | |
download | go-git-fbf2a4ab4588c78e3d9d0265dba774ae6b388b5f.tar.gz |
Merge pull request #507 from mcuadros/ctx
transport: context package support allowing cancellation of any network operation
Diffstat (limited to 'plumbing/transport/internal/common/common.go')
-rw-r--r-- | plumbing/transport/internal/common/common.go | 54 |
1 files changed, 45 insertions, 9 deletions
diff --git a/plumbing/transport/internal/common/common.go b/plumbing/transport/internal/common/common.go index 04db770..2db8d54 100644 --- a/plumbing/transport/internal/common/common.go +++ b/plumbing/transport/internal/common/common.go @@ -7,6 +7,7 @@ package common import ( "bufio" + "context" "errors" "fmt" "io" @@ -64,6 +65,13 @@ type Command interface { Close() error } +// CommandKiller expands the Command interface, enableing it for being killed. +type CommandKiller interface { + // Kill and close the session whatever the state it is. It will block until + // the command is terminated. + Kill() error +} + type client struct { cmdr Commander } @@ -212,7 +220,7 @@ func (s *session) handleAdvRefDecodeError(err error) error { // UploadPack performs a request to the server to fetch a packfile. A reader is // returned with the packfile content. The reader must be closed after reading. -func (s *session) UploadPack(req *packp.UploadPackRequest) (*packp.UploadPackResponse, error) { +func (s *session) UploadPack(ctx context.Context, req *packp.UploadPackRequest) (*packp.UploadPackResponse, error) { if req.IsEmpty() { return nil, transport.ErrEmptyUploadPackRequest } @@ -227,11 +235,14 @@ func (s *session) UploadPack(req *packp.UploadPackRequest) (*packp.UploadPackRes s.packRun = true - if err := uploadPack(s.Stdin, s.Stdout, req); err != nil { + in := s.StdinContext(ctx) + out := s.StdoutContext(ctx) + + if err := uploadPack(in, out, req); err != nil { return nil, err } - r, err := ioutil.NonEmptyReader(s.Stdout) + r, err := ioutil.NonEmptyReader(out) if err == ioutil.ErrEmptyReader { if c, ok := s.Stdout.(io.Closer); ok { _ = c.Close() @@ -244,22 +255,45 @@ func (s *session) UploadPack(req *packp.UploadPackRequest) (*packp.UploadPackRes return nil, err } - rc := ioutil.NewReadCloser(r, s.Command) + rc := ioutil.NewReadCloser(r, s) return DecodeUploadPackResponse(rc, req) } -func (s *session) ReceivePack(req *packp.ReferenceUpdateRequest) (*packp.ReportStatus, error) { +func (s *session) StdinContext(ctx context.Context) io.WriteCloser { + return ioutil.NewWriteCloserOnError( + ioutil.NewContextWriteCloser(ctx, s.Stdin), + s.onError, + ) +} + +func (s *session) StdoutContext(ctx context.Context) io.Reader { + return ioutil.NewReaderOnError( + ioutil.NewContextReader(ctx, s.Stdout), + s.onError, + ) +} + +func (s *session) onError(err error) { + if k, ok := s.Command.(CommandKiller); ok { + _ = k.Kill() + } + + _ = s.Close() +} + +func (s *session) ReceivePack(ctx context.Context, req *packp.ReferenceUpdateRequest) (*packp.ReportStatus, error) { if _, err := s.AdvertisedReferences(); err != nil { return nil, err } s.packRun = true - if err := req.Encode(s.Stdin); err != nil { + w := s.StdinContext(ctx) + if err := req.Encode(w); err != nil { return nil, err } - if err := s.Stdin.Close(); err != nil { + if err := w.Close(); err != nil { return nil, err } @@ -270,11 +304,12 @@ func (s *session) ReceivePack(req *packp.ReferenceUpdateRequest) (*packp.ReportS } report := packp.NewReportStatus() - if err := report.Decode(s.Stdout); err != nil { + if err := report.Decode(s.StdoutContext(ctx)); err != nil { return nil, err } if err := report.Error(); err != nil { + defer s.Close() return report, err } @@ -300,8 +335,9 @@ func (s *session) finish() error { } func (s *session) Close() (err error) { - defer ioutil.CheckClose(s.Command, &err) err = s.finish() + + defer ioutil.CheckClose(s.Command, &err) return } |