fix log streaming

This commit is contained in:
Asim Aslam 2020-01-02 18:23:43 +00:00
parent e697912ee5
commit 225b17559b
3 changed files with 7 additions and 2 deletions

View File

@ -180,5 +180,5 @@ func (g *grpcCodec) Close() error {
} }
func (g *grpcCodec) String() string { func (g *grpcCodec) String() string {
return g.c.Name() return "grpc"
} }

View File

@ -248,6 +248,7 @@ func (g *grpcServer) handler(srv interface{}, stream grpc.ServerStream) error {
contentType: ct, contentType: ct,
method: fmt.Sprintf("%s.%s", serviceName, methodName), method: fmt.Sprintf("%s.%s", serviceName, methodName),
codec: codec, codec: codec,
stream: true,
} }
response := &rpcResponse{ response := &rpcResponse{
@ -385,9 +386,11 @@ func (g *grpcServer) processRequest(stream grpc.ServerStream, service *service,
} }
return status.New(statusCode, statusDesc).Err() return status.New(statusCode, statusDesc).Err()
} }
if err := stream.SendMsg(replyv.Interface()); err != nil { if err := stream.SendMsg(replyv.Interface()); err != nil {
return err return err
} }
return status.New(statusCode, statusDesc).Err() return status.New(statusCode, statusDesc).Err()
} }
} }

View File

@ -346,7 +346,9 @@ func (router *router) readRequest(r Request) (service *service, mtype *methodTyp
} }
// is it a streaming request? then we don't read the body // is it a streaming request? then we don't read the body
if mtype.stream { if mtype.stream {
cc.ReadBody(nil) if cc.(codec.Codec).String() != "grpc" {
cc.ReadBody(nil)
}
return return
} }