unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 324 Wiki Activity

proxy/grpc: fix client streaming bug (EOF not sent to the server) (#2011)

Browse Source
This commit is contained in:
ben-toogood
2020-09-18 14:20:42 +01:00
committed by GitHub
parent 19a54f2970
commit 8975184b88
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
proxy/grpc/grpc.go
View File

@@ -40,10 +40,8 @@ func readLoop(r server.Request, s client.Stream) error {
// no need to decode it // no need to decode it
body, err := r.Read() body, err := r.Read()
if err == io.EOF { if err == io.EOF {
return nil return s.Close()
} } else if err != nil {
if err != nil {
return err return err
} }
@@ -55,11 +53,8 @@ func readLoop(r server.Request, s client.Stream) error {
Body: body, Body: body,
} }
// write the raw request // send the message to the stream
err = req.Codec().Write(msg, nil) if err := req.Codec().Write(msg, nil); err != nil {
if err == io.EOF {
return nil
} else if err != nil {
return err return err
} }
} }
@@ -168,8 +163,7 @@ func (p *Proxy) serveRequest(ctx context.Context, link client.Client, service, e
// create client request read loop if streaming // create client request read loop if streaming
go func() { go func() {
err := readLoop(req, stream) if err := readLoop(req, stream); err != nil {
if err != nil && err != io.EOF {
// cancel the context // cancel the context
cancel() cancel()
} }