ensure CloseSend is called, exit on errors

grpc-ecosystem · Jun 7, 2016 · 1725708 · 1725708
1 parent a5064d5
commit 1725708
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 30 deletions.
diff --git a/examples/examplepb/a_bit_of_everything.pb.gw.go b/examples/examplepb/a_bit_of_everything.pb.gw.go
diff --git a/examples/examplepb/flow_combination.pb.gw.go b/examples/examplepb/flow_combination.pb.gw.go
diff --git a/protoc-gen-grpc-gateway/gengateway/template.go b/protoc-gen-grpc-gateway/gengateway/template.go
@@ -245,8 +245,13 @@ var (
 		return nil, metadata, err
 	}
 	dec := marshaler.NewDecoder(req.Body)
-	sendErrs := make(chan error, 1)
+	firstSend:= make(chan error, 1)
 	go func(errs chan<- error) {
+		defer func(){
+			if err := stream.CloseSend(); err != nil {
+				grpclog.Printf("Failed to terminate client stream: %v", err)
+			}
+		}()
 		for {
 			var protoReq {{.Method.RequestType.GoType .Method.Service.File.GoPkg.Path}}
 			err = dec.Decode(&protoReq)
@@ -269,30 +274,25 @@ var (
 					case errs <- grpc.Errorf(codes.InvalidArgument, "%v", err):
 					default:
 				}
+				return
 			}
 			if err = stream.Send(&protoReq); err != nil {
 				grpclog.Printf("Failed to send request: %v", err)
 				select {
 					case errs <- err:
 					default:
 				}
+				return
 			}
 		}
-		if err := stream.CloseSend(); err != nil {
-			grpclog.Printf("Failed to terminate client stream: %v", err)
-			select {
-				case errs <- err:
-				default:
-			}
-		}
-	}(sendErrs)
+	}(firstSend)
 	header, err := stream.Header()
 	if err != nil {
 		grpclog.Printf("Failed to get header from client: %v", err)
 		return nil, metadata, err
 	}
 	metadata.HeaderMD = header
-	return stream, metadata, <-sendErrs
+	return stream, metadata, <-firstSend
 }
 `))