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

add documentation link and describe the 404/500 errors better

Browse Source
This commit is contained in:
Barak Michener 2015-01-30 19:41:44 -05:00
parent c66176b538
commit 37e8d608b3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
etcdctl/command/member_commands.go
View File

@ -163,7 +163,7 @@ func actionMemberRemove(c *cli.Context) {
listctx, cancel := context.WithTimeout(context.Background(), client.DefaultRequestTimeout) listctx, cancel := context.WithTimeout(context.Background(), client.DefaultRequestTimeout)
members, err := mAPI.List(listctx) members, err := mAPI.List(listctx)
if err != nil { if err != nil {
fmt.Fprintln(os.Stderr, err.Error()) fmt.Fprintln(os.Stderr, "Error while verifying ID against known members:", err.Error())
os.Exit(1) os.Exit(1)
} }
// Sanity check the input. // Sanity check the input.
@ -174,7 +174,8 @@ func actionMemberRemove(c *cli.Context) {
} }
if m.Name == removalID { if m.Name == removalID {
// Note that, so long as it's not ambiguous, we *could* do the right thing by name here. // Note that, so long as it's not ambiguous, we *could* do the right thing by name here.
fmt.Fprintf(os.Stderr, "Found a member named %s; if this is correct, please use its ID, eg:\n\tetcdctl member remove %s\n\n", m.Name, m.ID) fmt.Fprintf(os.Stderr, "Found a member named %s; if this is correct, please use its ID, eg:\n\tetcdctl member remove %s\n", m.Name, m.ID)
fmt.Fprintf(os.Stderr, "For more details, read the documentation at https://github.com/coreos/etcd/blob/master/Documentation/runtime-configuration.md#remove-a-member\n\n")
} }
} }
if !foundID { if !foundID {
@ -187,7 +188,7 @@ func actionMemberRemove(c *cli.Context) {
err = mAPI.Remove(ctx, removalID) err = mAPI.Remove(ctx, removalID)
cancel() cancel()
if err != nil { if err != nil {
fmt.Fprintln(os.Stderr, err.Error()) fmt.Fprintf(os.Stderr, "Recieved an error trying to remove member %s: %s", removalID, err.Error())
os.Exit(1) os.Exit(1)
} }