lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib: Provide detailed feedback about invalid URLs

Browse Source
This commit is contained in:
Johan Bloemberg
2018-02-15 22:20:16 +01:00
committed by James Shubin
parent 158fb8d31c
commit ffcc2aa2af
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/main.go
View File

@@ -164,31 +164,31 @@ func (obj *Main) Init() error {
util.FlattenListWithSplit(obj.Seeds, []string{",", ";", " "}), util.FlattenListWithSplit(obj.Seeds, []string{",", ";", " "}),
) )
if err != nil && len(obj.Seeds) > 0 { if err != nil && len(obj.Seeds) > 0 {
return fmt.Errorf("the Seeds didn't parse correctly") return errwrap.Wrapf(err, "the Seeds didn't parse correctly")
} }
obj.clientURLs, err = etcdtypes.NewURLs( obj.clientURLs, err = etcdtypes.NewURLs(
util.FlattenListWithSplit(obj.ClientURLs, []string{",", ";", " "}), util.FlattenListWithSplit(obj.ClientURLs, []string{",", ";", " "}),
) )
if err != nil && len(obj.ClientURLs) > 0 { if err != nil && len(obj.ClientURLs) > 0 {
return fmt.Errorf("the ClientURLs didn't parse correctly") return errwrap.Wrapf(err, "the ClientURLs didn't parse correctly")
} }
obj.serverURLs, err = etcdtypes.NewURLs( obj.serverURLs, err = etcdtypes.NewURLs(
util.FlattenListWithSplit(obj.ServerURLs, []string{",", ";", " "}), util.FlattenListWithSplit(obj.ServerURLs, []string{",", ";", " "}),
) )
if err != nil && len(obj.ServerURLs) > 0 { if err != nil && len(obj.ServerURLs) > 0 {
return fmt.Errorf("the ServerURLs didn't parse correctly") return errwrap.Wrapf(err, "the ServerURLs didn't parse correctly")
} }
obj.advertiseClientURLs, err = etcdtypes.NewURLs( obj.advertiseClientURLs, err = etcdtypes.NewURLs(
util.FlattenListWithSplit(obj.AdvertiseClientURLs, []string{",", ";", " "}), util.FlattenListWithSplit(obj.AdvertiseClientURLs, []string{",", ";", " "}),
) )
if err != nil && len(obj.AdvertiseClientURLs) > 0 { if err != nil && len(obj.AdvertiseClientURLs) > 0 {
return fmt.Errorf("the AdvertiseClientURLs didn't parse correctly") return errwrap.Wrapf(err, "the AdvertiseClientURLs didn't parse correctly")
} }
obj.advertiseServerURLs, err = etcdtypes.NewURLs( obj.advertiseServerURLs, err = etcdtypes.NewURLs(
util.FlattenListWithSplit(obj.AdvertiseServerURLs, []string{",", ";", " "}), util.FlattenListWithSplit(obj.AdvertiseServerURLs, []string{",", ";", " "}),
) )
if err != nil && len(obj.AdvertiseServerURLs) > 0 { if err != nil && len(obj.AdvertiseServerURLs) > 0 {
return fmt.Errorf("the AdvertiseServerURLs didn't parse correctly") return errwrap.Wrapf(err, "the AdvertiseServerURLs didn't parse correctly")
} }
obj.exit = make(chan error) obj.exit = make(chan error)