Fix error handling with server shutdown

crosbymichael · crosbymichael · commit 3afb82bd2726 · 2019-06-13T17:19:47.000Z
Signed-off-by: Michael Crosby &lt;crosbymichael@gmail.com&gt;
diff --git a/client.go b/client.go
@@ -202,7 +202,7 @@ func (r *receiver) run(ctx context.Context, c *channel) {
 				if !ok {
 					// treat all errors that are not an rpc status as terminal.
 					// all others poison the connection.
-					r.err = err
+					r.err = filterCloseErr(err)
 					return
 				}
 			}
@@ -328,22 +328,21 @@ func (c *Client) recv(resp *Response, msg *message) error {
 //
 // This purposely ignores errors with a wrapped cause.
 func filterCloseErr(err error) error {
-	if err == nil {
+	switch {
+	case err == nil:
 		return nil
-	}
-
-	if err == io.EOF {
+	case err == io.EOF:
 		return ErrClosed
-	}
-
-	if strings.Contains(err.Error(), "use of closed network connection") {
+	case errors.Cause(err) == io.EOF:
 		return ErrClosed
-	}
-
-	// if we have an epipe on a write, we cast to errclosed
-	if oerr, ok := err.(*net.OpError); ok && oerr.Op == "write" {
-		if serr, ok := oerr.Err.(*os.SyscallError); ok && serr.Err == syscall.EPIPE {
-			return ErrClosed
+	case strings.Contains(err.Error(), "use of closed network connection"):
+		return ErrClosed
+	default:
+		// if we have an epipe on a write, we cast to errclosed
+		if oerr, ok := err.(*net.OpError); ok && oerr.Op == "write" {
+			if serr, ok := oerr.Err.(*os.SyscallError); ok && serr.Err == syscall.EPIPE {
+				return ErrClosed
+			}
 		}
 	}
 
diff --git a/server_test.go b/server_test.go
@@ -351,7 +351,7 @@ func TestClientEOF(t *testing.T) {
 	}
 
 	// shutdown the server so the client stops receiving stuff.
-	if err := server.Shutdown(ctx); err != nil {
+	if err := server.Close(); err != nil {
 		t.Fatal(err)
 	}
 	if err := <-errs; err != ErrServerClosed {

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ func TestClientEOF(t *testing.T) {`
`351`	`351`	`}`
`352`	`352`
`353`	`353`	`// shutdown the server so the client stops receiving stuff.`
`354`		`- if err := server.Shutdown(ctx); err != nil {`
	`354`	`+ if err := server.Close(); err != nil {`
`355`	`355`	`t.Fatal(err)`
`356`	`356`	`}`
`357`	`357`	`if err := <-errs; err != ErrServerClosed {`