scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-10-07 11:27:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

simplify arguments to NewGossipMemberSet

Browse source
This commit is contained in:
Matt Jaffee 2018-06-27 07:18:16 -05:00
parent 7153499c6a
commit c312bc1316
No known key found for this signature in database
GPG key ID: 08A3DFFF987B11BF
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gossip/gossip.go
View file

@ -161,7 +161,8 @@ func WithLogger(logger *log.Logger) GossipMemberSetOption {
}
// NewGossipMemberSet returns a new instance of GossipMemberSet based on options.
func NewGossipMemberSet(name string, host string, cfg Config, s *pilosa.Server, options ...GossipMemberSetOption) (*GossipMemberSet, error) {
func NewGossipMemberSet(cfg Config, s *pilosa.Server, options ...GossipMemberSetOption) (*GossipMemberSet, error) {
host := s.Node().URI.Host()
g := &GossipMemberSet{
Logger: pilosa.NopLogger,
}
@ -206,11 +207,11 @@ func NewGossipMemberSet(name string, host string, cfg Config, s *pilosa.Server,
// memberlist config
conf := memberlist.DefaultWANConfig()
conf.Transport = g.transport.Net
conf.Name = name
conf.BindAddr = host
conf.Name = s.Node().ID
conf.BindAddr = s.Node().URI.Host()
conf.BindPort = port
conf.AdvertisePort = port
conf.AdvertiseAddr = hostToIP(host)
conf.AdvertiseAddr = hostToIP(s.Node().URI.Host())
//
conf.TCPTimeout = time.Duration(cfg.StreamTimeout)
conf.SuspicionMult = cfg.SuspicionMult

2
server/server.go
View file

@ -321,8 +321,6 @@ func (m *Command) SetupNetworking() error {
}
gossipMemberSet, err := gossip.NewGossipMemberSet(
m.Server.NodeID,
m.Server.URI.Host(),
m.Config.Gossip,
m.Server,
gossip.WithLogger(m.logger.Logger()),