docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #417 from frodenas/fix-createentries 

Ignore empty addresses when creating discovery entries
This commit is contained in:
Victor Vieux 2015-02-25 10:15:16 -08:00
parent f326bc1f21 cecdd7df02
commit 2acbea1149
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
discovery/discovery.go
View File

@ -84,6 +84,9 @@ func CreateEntries(addrs []string) ([]*Entry, error) {
}
for _, addr := range addrs {
if len(addr) == 0 {
continue
}
entry, err := NewEntry(addr)
if err != nil {
return nil, err

3
discovery/discovery_test.go
View File

@ -43,7 +43,8 @@ func TestCreateEntries(t *testing.T) {
assert.Equal(t, entries, []*Entry{})
assert.NoError(t, err)
entries, err = CreateEntries([]string{"127.0.0.1:2375", "127.0.0.2:2375"})
entries, err = CreateEntries([]string{"127.0.0.1:2375", "127.0.0.2:2375", ""})
assert.Equal(t, len(entries), 2)
assert.Equal(t, entries[0].String(), "127.0.0.1:2375")
assert.Equal(t, entries[1].String(), "127.0.0.2:2375")
assert.NoError(t, err)