Ma/origin
1
0
Fork 0
mirror of https://github.com/duanhf2012/origin.git synced 2026-03-13 11:37:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

扩统rpc序列化与反序列化支持

Browse Source
This commit is contained in:
duanhf2012
2020-04-21 13:23:18 +08:00
parent a906002f29
commit f74f3a812e
12 changed files with 474 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rpc/rpchandler.go
View File

@@ -16,9 +16,12 @@ var NilError = reflect.Zero(reflect.TypeOf((*error)(nil)).Elem())
type RpcError string
func (e *RpcError) Error() string {
if e == nil {
return ""
}
func (e RpcError) Error() string {
return string(e)
return string(*e)
}
func ConvertError(e error) *RpcError{
@@ -193,7 +196,7 @@ func (slf *RpcHandler) HandlerRpcRequest(request *RpcRequest) {
buf := make([]byte, 4096)
l := runtime.Stack(buf, false)
err := fmt.Errorf("%v: %s", r, buf[:l])
log.Error("Handler Rpc %s Core dump info:%+v\n",request.ServiceMethod,err)
log.Error("Handler Rpc %s Core dump info:%+v\n",request.RpcRequestData.GetServiceMethod(),err)
rpcErr := RpcError("call error : core dumps")
if request.requestHandle!=nil {
request.requestHandle(nil,&rpcErr)
@@ -201,9 +204,9 @@ func (slf *RpcHandler) HandlerRpcRequest(request *RpcRequest) {
}
}()
v,ok := slf.mapfunctons[request.ServiceMethod]
v,ok := slf.mapfunctons[request.RpcRequestData.GetServiceMethod()]
if ok == false {
err := Errorf("RpcHandler %s cannot find %s",slf.rpcHandler.GetName(),request.ServiceMethod)
err := Errorf("RpcHandler %s cannot find %s",slf.rpcHandler.GetName(),request.RpcRequestData.GetServiceMethod())
log.Error("%s",err.Error())
if request.requestHandle!=nil {
request.requestHandle(nil,err)
@@ -215,9 +218,9 @@ func (slf *RpcHandler) HandlerRpcRequest(request *RpcRequest) {
var paramList []reflect.Value
var err error
if request.localParam==nil{
err = processor.Unmarshal(request.InParam,&v.iparam)
err = processor.Unmarshal(request.RpcRequestData.GetInParam(),v.iparam)
if err!=nil {
rerr := Errorf("Call Rpc %s Param error %+v",request.ServiceMethod,err)
rerr := Errorf("Call Rpc %s Param error %+v",request.RpcRequestData.GetServiceMethod(),err)
log.Error("%s",rerr.Error())
if request.requestHandle!=nil {
request.requestHandle(nil, rerr)