rpc增加失败回调

Author: llr104

core/liFace/iconnect.go

@@ -26,7 +26,7 @@ type IConnection interface {
 	RemoteAddr() net.Addr
 
 	//直接将Message数据发送数据给远程的TCP客户端
-	RpcCall(msgName string, data []byte, f func(rsp IRespond)) error
+	RpcCall(msgName string, data []byte, success func(rsp IRespond), fail func(rsp IRespond)) error
 	RpcReply(msgName string, seq uint32, data []byte) error
 	RpcPush(msgName string, data []byte) error
 	CheckRpc(seq uint32, rsp IMessage) bool

core/liNet/connection.go

@@ -13,9 +13,10 @@ import (
 )
 
 type connReq struct {
-	function func(rsp liFace.IRespond)
-	req liFace.IRequest
-	time int64
+	successFun func(rsp liFace.IRespond)
+	failFun    func(rsp liFace.IRespond)
+	req        liFace.IRequest
+	time       int64
 }
 
 type Connection struct {
@@ -220,7 +221,7 @@ func (c *Connection) RemoteAddr() net.Addr {
 
 
 //直接将Message数据发送数据给远程的TCP客户端
-func (c *Connection) RpcCall(msgName string, data []byte, f func(rsp liFace.IRespond)) error {
+func (c *Connection) RpcCall(msgName string, data []byte, success func(rsp liFace.IRespond), fail func(rsp liFace.IRespond)) error {
 	c.rpcLock.Lock()
 	defer c.rpcLock.Unlock()
 
@@ -234,9 +235,10 @@ func (c *Connection) RpcCall(msgName string, data []byte, f func(rsp liFace.IRes
 	if err == nil{
 		r := Request{msg:m,conn:c}
 		rpc := connReq{
-			function: f,
-			req:      &r,
-			time:	time.Now().UnixNano(),
+			successFun: success,
+			failFun:    fail,
+			req:        &r,
+			time:       time.Now().UnixNano(),
 		}
 		c.rpcMap[c.lastSeq] = rpc
 	}
@@ -284,8 +286,8 @@ func (c *Connection) CheckRpc(seq uint32, rsp liFace.IMessage) bool{
 		return false
 	}else{
 		r := Respond{msg:rsp, req:rpc.req}
-		if rpc.function != nil{
-			rpc.function(&r)
+		if rpc.successFun != nil{
+			rpc.successFun(&r)
 		}
 		delete(c.rpcMap, seq)
 		return true
@@ -309,8 +311,8 @@ func (c *Connection) checkTimeOut(){
 				msg.SetMsgName(rpc.req.GetMessage().GetMsgName())
 				msg.SetSeq(rpc.req.GetMessage().GetSeq())
 				r := Respond{msg:&msg, req:rpc.req}
-				if rpc.function != nil{
-					rpc.function(&r)
+				if rpc.failFun != nil{
+					rpc.failFun(&r)
 				}
 				delete(c.rpcMap, rpc.req.GetMessage().GetSeq())
 				utils.Log.Info("rpc %s timeout", rpc.req.GetMessage().GetMsgName())

core/liNet/msghandler.go

@@ -64,7 +64,7 @@ func (mh *MsgHandle) DoMsgHandler(request liFace.IRequest, respond liFace.IMessa
 					//fmt.Println("DoMsgHandler reflect value",v)
 					method := v.MethodByName(funcName)
 					if method.IsValid() == false {
-						utils.Log.Warn("DoMsgHandler warning %s function not found",funcName)
+						utils.Log.Warn("DoMsgHandler warning %s successFun not found",funcName)
 					}else{
 						isFound = true
 						router := handler.Value.(liFace.IRouter)

gateserver.go

@@ -159,7 +159,7 @@ func routerToTarget(wsConn* liNet.WsConnection, msgName string, msgProxyId strin
 				isLive = true
 				proxyClient.GetConn().SetProperty("gateConn", wsConn)
 				proxyClient.GetConn().SetProperty("proxy", msgProxyId)
-				proxyClient.GetConn().RpcCall(msgName, sendData, gate.Router.Handle)
+				proxyClient.GetConn().RpcCall(msgName, sendData, gate.Router.Handle, gate.Router.HandleFail)
 			}
 		}else{
 

proto/errcode.go

@@ -3,7 +3,7 @@ package proto
 const (
 	Code_Success = iota   	//0
 	Code_Illegal
-	Code_User_Not_Exist
+	Code_ReqFail
 	Code_User_Error 		//账号或密码错误
 	Code_User_Exist
 	Code_User_Forbid

server/app/loginclient.go

@@ -72,7 +72,7 @@ func loginPingTimer(v ...interface{})  {
 
 	data ,err := json.Marshal(info)
 	if err == nil{
-		conn.RpcCall(proto.SystemPing, data, nil)
+		conn.RpcCall(proto.SystemPing, data, nil, nil)
 	}else{
 		utils.Log.Info("loginPingTimer error:%s", err.Error())
 	}

server/app/masterclient.go

@@ -87,7 +87,7 @@ func mPingTimer(v ...interface{})  {
 
 	data ,err := json.Marshal(info)
 	if err == nil{
-		conn.RpcCall(proto.SystemPing, data, nil)
+		conn.RpcCall(proto.SystemPing, data, nil, nil)
 	}else{
 		utils.Log.Info("mReportTimer error:%s", err.Error())
 	}
@@ -109,7 +109,7 @@ func mReportTimer(v ...interface{})  {
 
 	data ,err := json.Marshal(info)
 	if err == nil{
-		conn.RpcCall(proto.SystemServerInfoReport, data, nil)
+		conn.RpcCall(proto.SystemServerInfoReport, data, nil, nil)
 	}else{
 		utils.Log.Info("mReportTimer error:%s", err.Error())
 	}
@@ -124,7 +124,7 @@ func mServerListTimer(v ...interface{})  {
 
 		data ,err := json.Marshal(info)
 		if err == nil{
-			conn.RpcCall(proto.SystemServerListReq, data, MClientRouter.ServerListAck)
+			conn.RpcCall(proto.SystemServerListReq, data, MClientRouter.ServerListAck, nil)
 		}else{
 			utils.Log.Info("mServerListTimer error:%s", err.Error())
 		}

server/game/enter.go

@@ -81,7 +81,7 @@ func (s *enterGame) EveryThingHandle(req liFace.IRequest, rsp liFace.IMessage) {
 		}else{
 			v := msg.GetMsgName()
 			fmt.Println(v)
-			req.GetConnection().RpcCall(proto.AuthError, nil, nil)
+			req.GetConnection().RpcCall(proto.AuthError, nil, nil, nil)
 		}
 	}
 

server/gate/gate.go

@@ -159,7 +159,7 @@ func (g*gate) Reconnect(wsConn* liNet.WsConnection, handshakeId string) string{
 					pack.UserId = userId
 					pack.Type = proto.UserOnline
 					data, _ := json.Marshal(pack)
-					c.RpcCall(proto.SystemUserOnOrOffReq, data, nil)
+					c.RpcCall(proto.SystemUserOnOrOffReq, data, nil, nil)
 				}
 			}
 		}
@@ -201,7 +201,7 @@ func (g*gate) ConnectExit(wsConn* liNet.WsConnection){
 					pack.UserId = userId
 					pack.Type = proto.UserOffline
 					data, _ := json.Marshal(pack)
-					c.RpcCall(proto.SystemUserOnOrOffReq, data, nil)
+					c.RpcCall(proto.SystemUserOnOrOffReq, data, nil, nil)
 				}
 			}
 		}

server/gate/gaterouter.go

@@ -76,3 +76,28 @@ func (s *router) Handle(rsp liFace.IRespond) {
 	}
 
 }
+
+func (s *router) HandleFail(rsp liFace.IRespond) {
+	req := rsp.GetRequest()
+	conn, err := req.GetConnection().GetProperty("gateConn")
+	if err != nil{
+		utils.Log.Warn("Handle not found gateConn")
+	}
+
+	ack := proto.BaseAck{}
+	ack.Code =proto.Code_ReqFail
+
+	msg := rsp.GetMessage()
+	msgName := msg.GetMsgName()
+	gateConn := conn.(*liNet.WsConnection)
+    data, _ := json.Marshal(ack)
+    msg.SetBody(data)
+
+	proxy, e :=  req.GetConnection().GetProperty("proxy")
+	if e != nil{
+		gateConn.Push("", msgName,  rsp.GetData())
+	}else{
+		proxyName := proxy.(string)
+		gateConn.Response(proxyName, msgName, msg.GetSeq(), rsp.GetData())
+	}
+}