Merge pull request #980 from unistack-org/issue-940

grpc client goroutine leak fix

client/grpc/stream.go

@@ -43,16 +43,14 @@ func (g *grpcStream) Send(msg interface{}) error {
 func (g *grpcStream) Recv(msg interface{}) (err error) {
 	defer g.setError(err)
 	if err = g.stream.RecvMsg(msg); err != nil {
-		if err == io.EOF {
 		// #202 - inconsistent gRPC stream behavior
 		// the only way to tell if the stream is done is when we get a EOF on the Recv
 		// here we should close the underlying gRPC ClientConn
 		closeErr := g.conn.Close()
-			if closeErr != nil {
+		if err == io.EOF && closeErr != nil {
 			err = closeErr
 		}
 	}
-	}
 	return
 }