handle asyn error.

cbor88 · Jul 23, 2016 · 83adb73 · 83adb73
1 parent e51da2a
commit 83adb73
Showing 1 changed file with 8 additions and 17 deletions.
diff --git a/chanrpc/chanrpc.go b/chanrpc/chanrpc.go
@@ -260,10 +260,11 @@ func (c *Client) CallN(id interface{}, args ...interface{}) ([]interface{}, erro
 	return assert(ri.ret), ri.err
 }
 
-func (c *Client) asynCall(id interface{}, args []interface{}, cb interface{}, n int) error {
+func (c *Client) asynCall(id interface{}, args []interface{}, cb interface{}, n int) {
 	f, err := c.f(id, n)
 	if err != nil {
-		return err
+		c.chanAsynRet <- &RetInfo{err: err, cb: cb}
+		return
 	}
 
 	err = c.call(&CallInfo{
@@ -273,10 +274,9 @@ func (c *Client) asynCall(id interface{}, args []interface{}, cb interface{}, n
 		cb:      cb,
 	}, false)
 	if err != nil {
-		return err
+		c.chanAsynRet <- &RetInfo{err: err, cb: cb}
+		return
 	}
-
-	return nil
 }
 
 func (c *Client) AsynCall(id interface{}, _args ...interface{}) {
@@ -294,20 +294,11 @@ func (c *Client) AsynCall(id interface{}, _args ...interface{}) {
 	cb := _args[len(_args)-1]
 	switch cb.(type) {
 	case func(error):
-		err := c.asynCall(id, args, cb, 0)
-		if err != nil {
-			cb.(func(error))(err)
-		}
+		c.asynCall(id, args, cb, 0)
 	case func(interface{}, error):
-		err := c.asynCall(id, args, cb, 1)
-		if err != nil {
-			cb.(func(interface{}, error))(nil, err)
-		}
+		c.asynCall(id, args, cb, 1)
 	case func([]interface{}, error):
-		err := c.asynCall(id, args, cb, 2)
-		if err != nil {
-			cb.(func([]interface{}, error))(nil, err)
-		}
+		c.asynCall(id, args, cb, 2)
 	default:
 		panic("definition of callback function is invalid")
 	}