return error to caller on grpc server request processing (#962)

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2019-11-20 13:28:30 +03:00 committed by Asim Aslam
parent da6c1be607
commit 49d73faa5f

View File

@ -339,20 +339,26 @@ func (g *grpcServer) processRequest(stream grpc.ServerStream, service *service,
// define the handler func // define the handler func
fn := func(ctx context.Context, req server.Request, rsp interface{}) error { fn := func(ctx context.Context, req server.Request, rsp interface{}) error {
ch := make(chan error, 1)
defer close(ch)
defer func() { defer func() {
if r := recover(); r != nil { if r := recover(); r != nil {
log.Log("panic recovered: ", r) log.Log("panic recovered: ", r)
log.Logf(string(debug.Stack())) log.Logf(string(debug.Stack()))
ch <- errors.InternalServerError("go.micro.server", "panic recovered: %v", r)
} }
}() }()
returnValues = function.Call([]reflect.Value{service.rcvr, mtype.prepareContext(ctx), reflect.ValueOf(argv.Interface()), reflect.ValueOf(rsp)}) returnValues = function.Call([]reflect.Value{service.rcvr, mtype.prepareContext(ctx), reflect.ValueOf(argv.Interface()), reflect.ValueOf(rsp)})
// The return value for the method is an error. // The return value for the method is an error.
if err := returnValues[0].Interface(); err != nil { if err := returnValues[0].Interface(); err != nil {
return err.(error) ch <- err.(error)
} }
return nil ch <- nil
return <-ch
} }
// wrap the handler func // wrap the handler func