From 6912a8e59e38fe42199227a00f68ae7d003b1107 Mon Sep 17 00:00:00 2001 From: harryge00 Date: Sat, 28 Oct 2017 17:27:31 +0800 Subject: [PATCH] embed: return error when advertise-client-urls or initial-advertise-peer-urls are with empty hosts --- embed/config.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/embed/config.go b/embed/config.go index 520291cc5..65e1a6de0 100644 --- a/embed/config.go +++ b/embed/config.go @@ -399,22 +399,19 @@ func (cfg *Config) Validate() error { 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) + return fmt.Errorf(`--initial-advertise-peer-urls %q must be "host:port" (%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) + return fmt.Errorf(`--advertise-client-urls %q must be "host:port" (%v)`, strings.Join(addrs, ","), err) } - // Check if conflicting flags are passed. nSet := 0 for _, v := range []bool{cfg.Durl != "", cfg.InitialCluster != "", cfg.DNSCluster != ""} {