vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

etcdmain: fix that advertise-client-urls is required in proxy mode 

etcd proxy doesn't need to set advertise-client-urls because the flag is
not used.
release-2.1
Yicheng Qin 2015-06-10 15:06:49 -07:00
parent 30db41e031
commit cf7c83b304
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etcdmain/config.go
View File

@ -269,8 +269,12 @@ func (cfg *config) Parse(arguments []string) error {
if err != nil {
return err
}
if flags.IsSet(cfg.FlagSet, "listen-client-urls") && !flags.IsSet(cfg.FlagSet, "advertise-client-urls") {
return errUnsetAdvertiseClientURLsFlag
// when etcd runs in member mode user needs to set -advertise-client-urls if -listen-client-urls is set.
if cfg.proxy.String() != proxyFlagOn {
if flags.IsSet(cfg.FlagSet, "listen-client-urls") && !flags.IsSet(cfg.FlagSet, "advertise-client-urls") {
return errUnsetAdvertiseClientURLsFlag
}
}
if 5*cfg.TickMs > cfg.ElectionMs {