1f8fb17be7
This commit syncs ENT changes to the OSS repo. Original commit details in ENT: ``` commit 569d25f7f4578981c3801e6e067295668210f748 Author: FFMMM <FFMMM@users.noreply.github.com> Date: Thu Feb 10 10:23:33 2022 -0800 Vendor fork net rpc (#1538) * replace net/rpc w consul-net-rpc/net/rpc Signed-off-by: FFMMM <FFMMM@users.noreply.github.com> * replace msgpackrpc and go-msgpack with fork from mono repo Signed-off-by: FFMMM <FFMMM@users.noreply.github.com> * gofmt all files touched Signed-off-by: FFMMM <FFMMM@users.noreply.github.com> ``` Signed-off-by: FFMMM <FFMMM@users.noreply.github.com>
39 lines
788 B
Go
39 lines
788 B
Go
package lib
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"strings"
|
|
|
|
"github.com/hashicorp/consul-net-rpc/net/rpc"
|
|
"github.com/hashicorp/yamux"
|
|
)
|
|
|
|
var yamuxStreamClosed = yamux.ErrStreamClosed.Error()
|
|
var yamuxSessionShutdown = yamux.ErrSessionShutdown.Error()
|
|
|
|
// IsErrEOF returns true if we get an EOF error from the socket itself, or
|
|
// an EOF equivalent error from yamux.
|
|
func IsErrEOF(err error) bool {
|
|
if err == nil {
|
|
return false
|
|
}
|
|
if errors.Is(err, io.EOF) {
|
|
return true
|
|
}
|
|
|
|
errStr := err.Error()
|
|
if strings.Contains(errStr, yamuxStreamClosed) ||
|
|
strings.Contains(errStr, yamuxSessionShutdown) {
|
|
return true
|
|
}
|
|
|
|
var serverError rpc.ServerError
|
|
if errors.As(err, &serverError) {
|
|
return strings.HasSuffix(err.Error(), fmt.Sprintf(": %s", io.EOF.Error()))
|
|
}
|
|
|
|
return false
|
|
}
|