From b5a4aefe8bc044ba70a39a5a46bf90b08f807a96 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Thu, 19 Nov 2015 18:28:04 +0000 Subject: [PATCH] never broadcast empty nameserver gossip --- nameserver/nameserver.go | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/nameserver/nameserver.go b/nameserver/nameserver.go index 0d33d184..201bda3b 100644 --- a/nameserver/nameserver.go +++ b/nameserver/nameserver.go @@ -74,13 +74,13 @@ func (n *Nameserver) Stop() { } func (n *Nameserver) broadcastEntries(es ...Entry) error { - if n.gossip != nil { - return n.gossip.GossipBroadcast(&GossipData{ - Entries: Entries(es), - Timestamp: now(), - }) + if n.gossip == nil || len(es) == 0 { + return nil } - return nil + return n.gossip.GossipBroadcast(&GossipData{ + Entries: Entries(es), + Timestamp: now(), + }) } func (n *Nameserver) AddEntry(hostname, containerid string, origin mesh.PeerName, addr address.Address) error { @@ -133,10 +133,8 @@ func (n *Nameserver) ContainerDied(ident string) { return false }) n.Unlock() - if len(entries) > 0 { - if err := n.broadcastEntries(entries...); err != nil { - n.errorf("failed to broadcast container %s death: %v", ident, err) - } + if err := n.broadcastEntries(entries...); err != nil { + n.errorf("failed to broadcast container %s death: %v", ident, err) } }