Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

client: pass httpActionDo into NewMembersAPI

Browse Source
This commit is contained in:
Brian Waldon 2014-10-31 11:01:34 -07:00
parent 0ef270c25c
commit f6e8b677cf
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/members.go
View File

@ -34,18 +34,11 @@ var (
DefaultV2MembersPrefix = "/v2/members" DefaultV2MembersPrefix = "/v2/members"
) )
func NewMembersAPI(tr *http.Transport, eps []string, to time.Duration) (MembersAPI, error) { func NewMembersAPI(c httpActionDo, to time.Duration) MembersAPI {
c, err := NewHTTPClient(tr, eps) return &httpMembersAPI{
if err != nil {
return nil, err
}
mAPI := httpMembersAPI{
client: c, client: c,
timeout: to, timeout: to,
} }
return &mAPI, nil
} }
type MembersAPI interface { type MembersAPI interface {

4
etcdctl/command/member_commands.go
View File

@ -42,13 +42,13 @@ func mustNewMembersAPI(c *cli.Context) client.MembersAPI {
} }
} }
mAPI, err := client.NewMembersAPI(&http.Transport{}, peers, client.DefaultRequestTimeout) hc, err := client.NewHTTPClient(&http.Transport{}, peers)
if err != nil { if err != nil {
fmt.Fprintln(os.Stderr, err.Error()) fmt.Fprintln(os.Stderr, err.Error())
os.Exit(1) os.Exit(1)
} }
return mAPI return client.NewMembersAPI(hc, client.DefaultRequestTimeout)
} }
func actionMemberList(c *cli.Context) { func actionMemberList(c *cli.Context) {