Ma/origin
1
0
Fork 0
mirror of https://github.com/duanhf2012/origin.git synced 2026-02-17 18:04:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复服务在多协程模式下rpc调用不安全的bug

Browse Source
This commit is contained in:
duanhf2012
2020-04-26 18:26:21 +08:00
parent 776831ac42
commit 43f2d428a8
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rpc/rpchandler.go
View File

@@ -41,7 +41,7 @@ func Errorf(format string, a ...interface{}) *RpcError {
type RpcMethodInfo struct { type RpcMethodInfo struct {
method reflect.Method method reflect.Method
iparam interface{} iparam reflect.Value
oParam reflect.Value oParam reflect.Value
} }
@@ -133,7 +133,7 @@ func (slf *RpcHandler) suitableMethods(method reflect.Method) error {
return fmt.Errorf("%s Unsupported parameter types!",method.Name) return fmt.Errorf("%s Unsupported parameter types!",method.Name)
} }
rpcMethodInfo.iparam = reflect.New(typ.In(1).Elem()).Interface() //append(rpcMethodInfo.iparam,) rpcMethodInfo.iparam = reflect.New(typ.In(1).Elem()) //append(rpcMethodInfo.iparam,)
rpcMethodInfo.oParam = reflect.New(typ.In(2).Elem()) rpcMethodInfo.oParam = reflect.New(typ.In(2).Elem())
rpcMethodInfo.method = method rpcMethodInfo.method = method
@@ -215,10 +215,13 @@ func (slf *RpcHandler) HandlerRpcRequest(request *RpcRequest) {
return return
} }
var paramList []reflect.Value var paramList []reflect.Value
var err error var err error
iparam := reflect.New(v.iparam.Type().Elem()).Interface()
if request.localParam==nil{ if request.localParam==nil{
err = processor.Unmarshal(request.RpcRequestData.GetInParam(),v.iparam) err = processor.Unmarshal(request.RpcRequestData.GetInParam(),iparam)
if err!=nil { if err!=nil {
rerr := Errorf("Call Rpc %s Param error %+v",request.RpcRequestData.GetServiceMethod(),err) rerr := Errorf("Call Rpc %s Param error %+v",request.RpcRequestData.GetServiceMethod(),err)
log.Error("%s",rerr.Error()) log.Error("%s",rerr.Error())
@@ -227,7 +230,7 @@ func (slf *RpcHandler) HandlerRpcRequest(request *RpcRequest) {
} }
} }
}else { }else {
v.iparam = request.localParam iparam = request.localParam
} }
var oParam reflect.Value var oParam reflect.Value
@@ -235,7 +238,7 @@ func (slf *RpcHandler) HandlerRpcRequest(request *RpcRequest) {
oParam = reflect.New(v.oParam.Type().Elem()) oParam = reflect.New(v.oParam.Type().Elem())
paramList = append(paramList,reflect.ValueOf(v.iparam)) paramList = append(paramList,reflect.ValueOf(iparam))
paramList = append(paramList,oParam) //输出参数 paramList = append(paramList,oParam) //输出参数
returnValues := v.method.Func.Call(paramList) returnValues := v.method.Func.Call(paramList)