Skip to content

Commit

Permalink
Merge pull request #8384 from gyuho/advertise-url
Browse files Browse the repository at this point in the history
embed: warns about empty hosts in advertise urls
  • Loading branch information
gyuho committed Aug 11, 2017
2 parents 135b7f7 + fe344ef commit 8df2132
Showing 1 changed file with 29 additions and 0 deletions.
29 changes: 29 additions & 0 deletions embed/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,22 @@ func (cfg *Config) Validate() error {
if err := checkBindURLs(cfg.ListenMetricsUrls); err != nil {
return err
}
if err := checkHostURLs(cfg.APUrls); err != nil {
// TODO: return err in v3.4
addrs := make([]string, len(cfg.APUrls))
for i := range cfg.APUrls {
addrs[i] = cfg.APUrls[i].String()
}
plog.Warningf("advertise-peer-urls %q is deprecated (%v)", strings.Join(addrs, ","), err)
}
if err := checkHostURLs(cfg.ACUrls); err != nil {
// TODO: return err in v3.4
addrs := make([]string, len(cfg.ACUrls))
for i := range cfg.ACUrls {
addrs[i] = cfg.ACUrls[i].String()
}
plog.Warningf("advertise-client-urls %q is deprecated (%v)", strings.Join(addrs, ","), err)
}

// Check if conflicting flags are passed.
nSet := 0
Expand Down Expand Up @@ -484,3 +500,16 @@ func checkBindURLs(urls []url.URL) error {
}
return nil
}

func checkHostURLs(urls []url.URL) error {
for _, url := range urls {
host, _, err := net.SplitHostPort(url.Host)
if err != nil {
return err
}
if host == "" {
return fmt.Errorf("unexpected empty host (%s)", url.String())
}
}
return nil
}

0 comments on commit 8df2132

Please sign in to comment.