Browse Source

client: pass httpActionDo into NewMembersAPI

Brian Waldon 11 years ago
parent
commit
f6e8b677cf
2 changed files with 4 additions and 11 deletions
  1. 2 9
      client/members.go
  2. 2 2
      etcdctl/command/member_commands.go

+ 2 - 9
client/members.go

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

+ 2 - 2
etcdctl/command/member_commands.go

@@ -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 {
 		fmt.Fprintln(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 
-	return mAPI
+	return client.NewMembersAPI(hc, client.DefaultRequestTimeout)
 }
 
 func actionMemberList(c *cli.Context) {