This commit is contained in:
crusader 2017-11-01 18:41:40 +09:00
parent a8f6ae169e
commit 8712bafeb6

View File

@ -25,8 +25,8 @@ type Client interface {
Close() Close()
Notify(method string, args interface{}) error Notify(method string, args interface{}) error
Call(method string, args interface{}, result interface{}) error Call(method string, args interface{}) (result interface{}, err error)
CallTimeout(method string, args interface{}, result interface{}, timeout time.Duration) error CallTimeout(method string, args interface{}, timeout time.Duration) (result interface{}, err error)
} }
type client struct { type client struct {
@ -78,11 +78,11 @@ func (c *client) Notify(method string, args interface{}) error {
return err return err
} }
func (c *client) Call(method string, args interface{}, result interface{}) error { func (c *client) Call(method string, args interface{}) (result interface{}, err error) {
return c.CallTimeout(method, args, result, c.ch.GetRequestTimeout()) return c.CallTimeout(method, args, c.ch.GetRequestTimeout())
} }
func (c *client) CallTimeout(method string, args interface{}, result interface{}, timeout time.Duration) (err error) { func (c *client) CallTimeout(method string, args interface{}, timeout time.Duration) (result interface{}, err error) {
var cs *CallState var cs *CallState
if cs, err = c.send(method, args, result, true, true); nil != err { if cs, err = c.send(method, args, result, true, true); nil != err {
return return
@ -101,7 +101,7 @@ func (c *client) CallTimeout(method string, args interface{}, result interface{}
releaseTimer(t) releaseTimer(t)
return nil return
} }
func (c *client) send(method string, args interface{}, result interface{}, hasResponse bool, usePool bool) (cs *CallState, err error) { func (c *client) send(method string, args interface{}, result interface{}, hasResponse bool, usePool bool) (cs *CallState, err error) {