浏览代码

etcdctl: break out mustNewMembersAPI

Brian Waldon 11 年之前
父节点
当前提交
dee912f2fd
共有 1 个文件被更改,包括 12 次插入18 次删除
  1. 12 18
      etcdctl/command/member_commands.go

+ 12 - 18
etcdctl/command/member_commands.go

@@ -33,18 +33,22 @@ func NewMemberCommand() cli.Command {
 	}
 	}
 }
 }
 
 
-func actionMemberList(c *cli.Context) {
-	if len(c.Args()) != 0 {
-		fmt.Fprintln(os.Stderr, "No arguments accepted")
-		os.Exit(1)
-	}
-
+func mustNewMembersAPI(c *cli.Context) client.MembersAPI {
 	mAPI, err := client.NewMembersAPI(&http.Transport{}, "http://127.0.0.1:4001", client.DefaultRequestTimeout)
 	mAPI, err := client.NewMembersAPI(&http.Transport{}, "http://127.0.0.1:4001", client.DefaultRequestTimeout)
 	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
+}
+
+func actionMemberList(c *cli.Context) {
+	if len(c.Args()) != 0 {
+		fmt.Fprintln(os.Stderr, "No arguments accepted")
+		os.Exit(1)
+	}
+	mAPI := mustNewMembersAPI(c)
 	members, err := mAPI.List()
 	members, err := mAPI.List()
 	if err != nil {
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err.Error())
 		fmt.Fprintln(os.Stderr, err.Error())
@@ -63,12 +67,7 @@ func actionMemberAdd(c *cli.Context) {
 		os.Exit(1)
 		os.Exit(1)
 	}
 	}
 
 
-	mAPI, err := client.NewMembersAPI(&http.Transport{}, "http://127.0.0.1:4001", client.DefaultRequestTimeout)
-	if err != nil {
-		fmt.Fprintln(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
+	mAPI := mustNewMembersAPI(c)
 	url := args[0]
 	url := args[0]
 	m, err := mAPI.Add(url)
 	m, err := mAPI.Add(url)
 	if err != nil {
 	if err != nil {
@@ -86,12 +85,7 @@ func actionMemberRemove(c *cli.Context) {
 		os.Exit(1)
 		os.Exit(1)
 	}
 	}
 
 
-	mAPI, err := client.NewMembersAPI(&http.Transport{}, "http://127.0.0.1:4001", client.DefaultRequestTimeout)
-	if err != nil {
-		fmt.Fprintln(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
+	mAPI := mustNewMembersAPI(c)
 	mID := args[0]
 	mID := args[0]
 	if err := mAPI.Remove(mID); err != nil {
 	if err := mAPI.Remove(mID); err != nil {
 		fmt.Fprintln(os.Stderr, err.Error())
 		fmt.Fprintln(os.Stderr, err.Error())