grpc: cancel stream

This commit is contained in:
ginuerzh
2022-12-30 19:34:48 +08:00
parent bb106e2d89
commit 3b245ec381
2 changed files with 8 additions and 18 deletions

View File

@ -1,8 +1,8 @@
package grpc
import (
"context"
"errors"
"io"
"net"
"time"
@ -14,7 +14,7 @@ type conn struct {
rb []byte
localAddr net.Addr
remoteAddr net.Addr
closed chan struct{}
cancelFunc context.CancelFunc
}
func (c *conn) Read(b []byte) (n int, err error) {
@ -22,9 +22,6 @@ func (c *conn) Read(b []byte) (n int, err error) {
case <-c.c.Context().Done():
err = c.c.Context().Err()
return
case <-c.closed:
err = io.ErrClosedPipe
return
default:
}
@ -46,9 +43,6 @@ func (c *conn) Write(b []byte) (n int, err error) {
case <-c.c.Context().Done():
err = c.c.Context().Err()
return
case <-c.closed:
err = io.ErrClosedPipe
return
default:
}
@ -62,14 +56,8 @@ func (c *conn) Write(b []byte) (n int, err error) {
}
func (c *conn) Close() error {
select {
case <-c.closed:
default:
close(c.closed)
return c.c.CloseSend()
}
return nil
defer c.cancelFunc()
return c.c.CloseSend()
}
func (c *conn) LocalAddr() net.Addr {