Merge pull request #4426 from gyuho/f0

etcd-agent: fix data-dir path check
This commit is contained in:
Gyu-Ho Lee 2016-02-04 18:34:16 -08:00
commit f003e421f5

View File

@ -150,9 +150,9 @@ func (a *Agent) status() client.Status {
func (a *Agent) dataDir() string { func (a *Agent) dataDir() string {
datadir := path.Join(a.cmd.Path, "*.etcd") datadir := path.Join(a.cmd.Path, "*.etcd")
args := a.cmd.Args args := a.cmd.Args
// only parse the simple case like "-data-dir /var/lib/etcd" // only parse the simple case like "--data-dir /var/lib/etcd"
for i, arg := range args { for i, arg := range args {
if arg == "-data-dir" { if arg == "--data-dir" {
datadir = args[i+1] datadir = args[i+1]
break break
} }