chanrpc在外部返回函数时，忽略返回类型检测，方便后期做统一的转发机制；

heyilin416 · Mar 16, 2017 · 85646d7 · 85646d7
1 parent 92c2e47
commit 85646d7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/chanrpc/chanrpc.go b/chanrpc/chanrpc.go
@@ -261,6 +261,8 @@ func (c *Client) f(id interface{}, n int) (f interface{}, err error) {
 		_, ok = f.(func([]interface{}) (interface{}, error))
 	case 2:
 		_, ok = f.(func([]interface{}) ([]interface{}, error))
+	case -1:
+		ok = true
 	default:
 		panic("bug")
 	}
@@ -394,6 +396,8 @@ func (c *Client) AsynCall(id interface{}, _args ...interface{}) {
 		n = 1
 	case func([]interface{}, error):
 		n = 2
+	case ExtRetFunc:
+		n = -1
 	default:
 		panic("definition of callback function is invalid")
 	}
@@ -423,6 +427,8 @@ func execCb(ri *RetInfo) {
 		ri.Cb.(func(interface{}, error))(ri.Ret, ri.Err)
 	case func([]interface{}, error):
 		ri.Cb.(func([]interface{}, error))(Assert(ri.Ret), ri.Err)
+	case ExtRetFunc:
+		ri.Cb.(ExtRetFunc)(ri.Ret, ri.Err)
 	default:
 		panic("bug")
 	}

diff --git a/cluster/cluster.go b/cluster/cluster.go
@@ -69,7 +69,7 @@ func run() {
 		case <-timer.C:
 			agentsMutex.RLock()
 			for _, agent := range agents {
-				if atomic.AddInt32(&agent.heartHeatWaitTimes, 1) >= 2 {
+				if atomic.AddInt32(&agent.heartBeatWaitTimes, 1) >= 2 {
 					agent.conn.Destroy()
 				} else {
 					agent.WriteMsg(msg)
@@ -189,7 +189,7 @@ type Agent struct {
 	ServerName         string
 	conn               *network.TCPConn
 	userData           interface{}
-	heartHeatWaitTimes int32
+	heartBeatWaitTimes int32
 
 	sync.Mutex
 	requestID    uint32

diff --git a/cluster/msg.go b/cluster/msg.go
@@ -53,7 +53,7 @@ func handleNotifyServerName(args []interface{}) {
 
 func handleHeartBeat(args []interface{}) {
 	agent := args[1].(*Agent)
-	atomic.StoreInt32(&agent.heartHeatWaitTimes, 0)
+	atomic.StoreInt32(&agent.heartBeatWaitTimes, 0)
 }
 
 func handleRequestMsg(args []interface{}) {