internal/jsonrpc2_v2: consider ErrClosedPipe as a closing error
There was already handling in isClosingErr for errors from Stdin/Stdout and TCP connections. Add handling for io.Pipe closing errors. Change-Id: I8d171ab49a3fffe0fca9f0482f6b92d61b1fae1f Reviewed-on: https://go-review.googlesource.com/c/tools/+/320849 Trust: Robert Findley <rfindley@google.com> Run-TryBot: Robert Findley <rfindley@google.com> gopls-CI: kokoro <noreply+kokoro@google.com> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Ian Cottrell <iancottrell@google.com>
This commit is contained in:
parent
76e263b8c9
commit
df36e4f0cb
1 changed files with 17 additions and 8 deletions
|
|
@ -133,16 +133,21 @@ func isClosingError(err error) bool {
|
|||
if err == nil {
|
||||
return false
|
||||
}
|
||||
// fully unwrap the error, so the following tests work
|
||||
// Fully unwrap the error, so the following tests work.
|
||||
for wrapped := err; wrapped != nil; wrapped = errors.Unwrap(err) {
|
||||
err = wrapped
|
||||
}
|
||||
|
||||
// was it based on an EOF error?
|
||||
// Was it based on an EOF error?
|
||||
if err == io.EOF {
|
||||
return true
|
||||
}
|
||||
|
||||
// Was it based on a closed pipe?
|
||||
if err == io.ErrClosedPipe {
|
||||
return true
|
||||
}
|
||||
|
||||
// Per https://github.com/golang/go/issues/4373, this error string should not
|
||||
// change. This is not ideal, but since the worst that could happen here is
|
||||
// some superfluous logging, it is acceptable.
|
||||
|
|
|
|||
Loading…
Reference in a new issue