github/ttrpc
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #66 from shsjshentao/fixbug/assertError

Browse Source 
fix bug, failed to assert net error due to error wrap
This commit is contained in:
Stephen Day 2020-08-12 10:56:04 -07:00 committed by GitHub
commit 09ff6c422e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client.go
View File

@ -339,7 +339,8 @@ func filterCloseErr(err error) error {
return ErrClosed return ErrClosed
default: default:
// if we have an epipe on a write or econnreset on a read , we cast to errclosed // if we have an epipe on a write or econnreset on a read , we cast to errclosed
if oerr, ok := err.(*net.OpError); ok && (oerr.Op == "write" || oerr.Op == "read") { var oerr *net.OpError
if errors.As(err, &oerr) && (oerr.Op == "write" || oerr.Op == "read") {
serr, sok := oerr.Err.(*os.SyscallError) serr, sok := oerr.Err.(*os.SyscallError)
if sok && ((serr.Err == syscall.EPIPE && oerr.Op == "write") || if sok && ((serr.Err == syscall.EPIPE && oerr.Op == "write") ||
(serr.Err == syscall.ECONNRESET && oerr.Op == "read")) { (serr.Err == syscall.ECONNRESET && oerr.Op == "read")) {