etcdctl: use a context with -total-timeout in simple commands
Like the commit 8ebc933111
, this commit lets simple etcdctl commands
use a context with timeout value passed via -total-timeout.
This commit doesn't change complex commands like watch,
cluster-health, and import because it is not obvious that using the
context in the commands is good or not.
This commit is contained in:
@ -18,7 +18,6 @@ import (
|
||||
"errors"
|
||||
|
||||
"github.com/coreos/etcd/Godeps/_workspace/src/github.com/codegangsta/cli"
|
||||
"github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context"
|
||||
"github.com/coreos/etcd/client"
|
||||
)
|
||||
|
||||
@ -40,7 +39,9 @@ func rmdirCommandFunc(c *cli.Context, ki client.KeysAPI) {
|
||||
}
|
||||
key := c.Args()[0]
|
||||
|
||||
resp, err := ki.Delete(context.TODO(), key, &client.DeleteOptions{Dir: true})
|
||||
ctx, cancel := contextWithTotalTimeout(c)
|
||||
resp, err := ki.Delete(ctx, key, &client.DeleteOptions{Dir: true})
|
||||
cancel()
|
||||
if err != nil {
|
||||
handleError(ExitServerError, err)
|
||||
}
|
||||
|
Reference in New Issue
Block a user