From e4c11a28b118516458cdbadd9eaeef8d860e4fe7 Mon Sep 17 00:00:00 2001
From: Travis Turner <travis@pilosa.com>
Date: Wed, 9 May 2018 10:42:11 -0500
Subject: [PATCH 1/2] make sure gossipMemberSet.Logger is set during server
 setup

---
 server/server.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/server/server.go b/server/server.go
index 3098cddeb..a3824cbc3 100644
--- a/server/server.go
+++ b/server/server.go
@@ -300,10 +300,19 @@ func (m *Command) SetupNetworking() error {
 
 	gossipEventReceiver := gossip.NewGossipEventReceiver(m.logger)
 	m.Server.Cluster.EventReceiver = gossipEventReceiver
-	gossipMemberSet, err := gossip.NewGossipMemberSet(m.Server.NodeID, m.Server.URI.Host(), m.Config.Gossip, gossipEventReceiver, m.Server, gossip.WithLogger(m.logger.Logger()), gossip.WithTransport(transport))
+	gossipMemberSet, err := gossip.NewGossipMemberSet(
+		m.Server.NodeID,
+		m.Server.URI.Host(),
+		m.Config.Gossip,
+		gossipEventReceiver,
+		m.Server,
+		gossip.WithLogger(m.logger.Logger()),
+		gossip.WithTransport(transport),
+	)
 	if err != nil {
 		return err
 	}
+	gossipMemberSet.Logger = m.logger
 	m.Server.Cluster.MemberSet = gossipMemberSet
 	m.Server.Broadcaster = m.Server
 	m.Server.BroadcastReceiver = gossipMemberSet

From 5e043919ae9ce898b4937ce0bba39aee82b923e5 Mon Sep 17 00:00:00 2001
From: Travis Turner <travis@pilosa.com>
Date: Wed, 9 May 2018 10:48:49 -0500
Subject: [PATCH 2/2] default GossipMemberSet.Logger to NopLogger

---
 gossip/gossip.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gossip/gossip.go b/gossip/gossip.go
index 25dd40cc4..49b66d8a2 100644
--- a/gossip/gossip.go
+++ b/gossip/gossip.go
@@ -169,7 +169,9 @@ func WithLogger(logger *log.Logger) GossipMemberSetOption {
 
 // NewGossipMemberSet returns a new instance of GossipMemberSet based on options.
 func NewGossipMemberSet(name string, host string, cfg Config, ger *GossipEventReceiver, sh pilosa.StatusHandler, options ...GossipMemberSetOption) (*GossipMemberSet, error) {
-	g := &GossipMemberSet{}
+	g := &GossipMemberSet{
+		Logger: pilosa.NopLogger,
+	}
 
 	// options
 	for _, opt := range options {