mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
etcdmain: fix path printing
This commit is contained in:
parent
a637e86372
commit
1b572ae2dd
@ -315,7 +315,7 @@ func startProxy(cfg *config) error {
|
|||||||
switch {
|
switch {
|
||||||
case err == nil:
|
case err == nil:
|
||||||
if cfg.durl != "" {
|
if cfg.durl != "" {
|
||||||
plog.Warningf("discovery token ignored since the proxy has already been initialized. Valid cluster file found at ./%s", clusterfile)
|
plog.Warningf("discovery token ignored since the proxy has already been initialized. Valid cluster file found at %q", clusterfile)
|
||||||
}
|
}
|
||||||
urls := struct{ PeerURLs []string }{}
|
urls := struct{ PeerURLs []string }{}
|
||||||
err := json.Unmarshal(b, &urls)
|
err := json.Unmarshal(b, &urls)
|
||||||
@ -323,7 +323,7 @@ func startProxy(cfg *config) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
peerURLs = urls.PeerURLs
|
peerURLs = urls.PeerURLs
|
||||||
plog.Infof("proxy: using peer urls %v from cluster file ./%s", peerURLs, clusterfile)
|
plog.Infof("proxy: using peer urls %v from cluster file %q", peerURLs, clusterfile)
|
||||||
case os.IsNotExist(err):
|
case os.IsNotExist(err):
|
||||||
if cfg.durl != "" {
|
if cfg.durl != "" {
|
||||||
s, err := discovery.GetCluster(cfg.durl, cfg.dproxy)
|
s, err := discovery.GetCluster(cfg.durl, cfg.dproxy)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user