From d96a121347ca9ff714feda4453aeb9ad138a2c13 Mon Sep 17 00:00:00 2001 From: Alan Bernstein Date: Tue, 27 Jun 2017 09:52:40 -0500 Subject: [PATCH] Simplify function arguments --- gossip/gossip.go | 6 +++--- server/server.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gossip/gossip.go b/gossip/gossip.go index c8d9a616d..92ec94c97 100644 --- a/gossip/gossip.go +++ b/gossip/gossip.go @@ -97,9 +97,9 @@ type gossipConfig struct { } // NewGossipNodeSet returns a new instance of GossipNodeSet. -func NewGossipNodeSet(name string, gossipHost string, gossipPort int, gossipSeed string, sh pilosa.StatusHandler, logOutput io.Writer) *GossipNodeSet { +func NewGossipNodeSet(name string, gossipHost string, gossipPort int, gossipSeed string, server *pilosa.Server) *GossipNodeSet { g := &GossipNodeSet{ - LogOutput: logOutput, + LogOutput: server.LogOutput, } //TODO: pull memberlist config from pilosa.cfg file @@ -114,7 +114,7 @@ func NewGossipNodeSet(name string, gossipHost string, gossipPort int, gossipSeed g.config.memberlistConfig.AdvertisePort = gossipPort g.config.memberlistConfig.Delegate = g - g.statusHandler = sh + g.statusHandler = server return g } diff --git a/server/server.go b/server/server.go index 88f4c4f5d..f66b88870 100644 --- a/server/server.go +++ b/server/server.go @@ -176,7 +176,7 @@ func (m *Command) SetupServer() error { if err != nil { gossipHost = m.Config.Host } - gossipNodeSet := gossip.NewGossipNodeSet(m.Config.Host, gossipHost, gossipPort, gossipSeed, m.Server, m.Server.LogOutput) + gossipNodeSet := gossip.NewGossipNodeSet(m.Config.Host, gossipHost, gossipPort, gossipSeed, m.Server) m.Server.Cluster.NodeSet = gossipNodeSet m.Server.Broadcaster = gossipNodeSet m.Server.BroadcastReceiver = gossipNodeSet