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

Merge pull request #1011 from Astone-Chou/master

Browse Source 
optimize: a better way for return error
This commit is contained in:
Asim Aslam
2019-12-03 07:48:21 +00:00
committed by GitHub
parent b5d65305db f9b900b2ca
commit 34c92f4964
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/grpc/grpc.go
View File

@@ -343,27 +343,22 @@ 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{}) (err 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) err = 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 rerr := returnValues[0].Interface(); rerr != nil {
ch <- err.(error) err = rerr.(error)
} }
ch <- nil return err
return <-ch
} }
// wrap the handler func // wrap the handler func