kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #1274 from aboch/gsr

Browse source 
Make getSvcRecords() more robust
This commit is contained in:
Santhosh Manohar 2016-06-18 11:37:37 -07:00 committed by GitHub
commit 467ac53445
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libnetwork/network.go
View file

@ -1099,14 +1099,22 @@ func (n *network) getSvcRecords(ep *endpoint) []etchosts.Record {
n.Lock() n.Lock()
defer n.Unlock() defer n.Unlock()
if ep == nil {
return nil
}
var recs []etchosts.Record var recs []etchosts.Record
sr, _ := n.ctrlr.svcRecords[n.id] sr, _ := n.ctrlr.svcRecords[n.id]
epName := ep.Name()
for h, ip := range sr.svcMap { for h, ip := range sr.svcMap {
if ep != nil && strings.Split(h, ".")[0] == ep.Name() { if strings.Split(h, ".")[0] == epName {
continue
}
if len(ip) == 0 {
log.Warnf("Found empty list of IP addresses for service %s on network %s (%s)", h, n.Name(), n.ID())
continue continue
} }
recs = append(recs, etchosts.Record{ recs = append(recs, etchosts.Record{
Hosts: h, Hosts: h,
IP: ip[0].String(), IP: ip[0].String(),