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

etcdctl: break out mustNewMembersAPI

Browse Source
This commit is contained in:
Brian Waldon 2014-10-30 15:33:22 -07:00
parent bc62b05c7f
commit dee912f2fd
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
etcdctl/command/member_commands.go
View File

@ -33,18 +33,22 @@ func NewMemberCommand() cli.Command {
} }
} }
func actionMemberList(c *cli.Context) { func mustNewMembersAPI(c *cli.Context) client.MembersAPI {
if len(c.Args()) != 0 {
fmt.Fprintln(os.Stderr, "No arguments accepted")
os.Exit(1)
}
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) mAPI := mustNewMembersAPI(c)
if err != nil {
fmt.Fprintln(os.Stderr, err.Error())
os.Exit(1)
}
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) mAPI := mustNewMembersAPI(c)
if err != nil {
fmt.Fprintln(os.Stderr, err.Error())
os.Exit(1)
}
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())