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

修复RPC函数返回错误，在回调函数处无法获得err

Browse Source
This commit is contained in:
lifeiyi
2020-06-10 21:03:05 +08:00
parent c7d11afcbd
commit 4ce1b80947
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rpc/server.go
View File

@@ -91,12 +91,17 @@ func (agent *RpcAgent) WriteRespone(serviceMethod string,seq uint64,reply interf
var mReply []byte var mReply []byte
var rpcError *RpcError var rpcError *RpcError
var errM error var errM error
if err != nil {
rpcError = err
} else {
if reply!=nil { if reply!=nil {
mReply,errM = processor.Marshal(reply) mReply,errM = processor.Marshal(reply)
if errM != nil { if errM != nil {
rpcError = ConvertError(errM) rpcError = ConvertError(errM)
} }
} }
}
rpcRespone.RpcResponeData = processor.MakeRpcResponse(seq,rpcError,mReply) rpcRespone.RpcResponeData = processor.MakeRpcResponse(seq,rpcError,mReply)
bytes,errM := processor.Marshal(rpcRespone.RpcResponeData) bytes,errM := processor.Marshal(rpcRespone.RpcResponeData)
if errM != nil { if errM != nil {