NewXXXClient doesnt run Start or return error

This commit is contained in:
Ethan Buchman
2017-05-15 11:29:34 -04:00
parent fadfcfdcb0
commit eda4f2dddc
9 changed files with 46 additions and 33 deletions
+4 -3
View File
@@ -43,15 +43,16 @@ type Client interface {
//----------------------------------------
// NewClient returns a new ABCI client of the specified transport type.
// It returns an error if the transport is not "socket" or "grpc"
func NewClient(addr, transport string, mustConnect bool) (client Client, err error) {
switch transport {
case "socket":
client, err = NewSocketClient(addr, mustConnect)
client = NewSocketClient(addr, mustConnect)
case "grpc":
client, err = NewGRPCClient(addr, mustConnect)
client = NewGRPCClient(addr, mustConnect)
default:
err = fmt.Errorf("Unknown abci transport %s", transport)
}
return
}
+2 -3
View File
@@ -27,14 +27,13 @@ type grpcClient struct {
resCb func(*types.Request, *types.Response) // listens to all callbacks
}
func NewGRPCClient(addr string, mustConnect bool) (*grpcClient, error) {
func NewGRPCClient(addr string, mustConnect bool) *grpcClient {
cli := &grpcClient{
addr: addr,
mustConnect: mustConnect,
}
cli.BaseService = *cmn.NewBaseService(nil, "grpcClient", cli)
_, err := cli.Start() // Just start it, it's confusing for callers to remember to start.
return cli, err
return cli
}
func dialerFunc(addr string, timeout time.Duration) (net.Conn, error) {
+2 -5
View File
@@ -42,7 +42,7 @@ type socketClient struct {
}
func NewSocketClient(addr string, mustConnect bool) (*socketClient, error) {
func NewSocketClient(addr string, mustConnect bool) *socketClient {
cli := &socketClient{
reqQueue: make(chan *ReqRes, reqQueueSize),
flushTimer: cmn.NewThrottleTimer("socketClient", flushThrottleMS),
@@ -53,10 +53,7 @@ func NewSocketClient(addr string, mustConnect bool) (*socketClient, error) {
resCb: nil,
}
cli.BaseService = *cmn.NewBaseService(nil, "socketClient", cli)
// FIXME we are loosing "Starting socketClient" message here
// add logger to params?
_, err := cli.Start() // Just start it, it's confusing for callers to remember to start.
return cli, err
return cli
}
func (cli *socketClient) OnStart() error {