Merge branch 'develop' into addnode-ue

server.go

@@ -263,6 +263,7 @@ func NewServer(opts ...ServerOption) (*Server, error) {
 		s.URI.SetPort(uint16(s.ln.Addr().(*net.TCPAddr).Port))
 	}
 
+	// Get or create NodeID.
 	s.NodeID = s.LoadNodeID()
 	// Set Cluster Node.
 	node := &Node{
@@ -271,6 +272,8 @@ func NewServer(opts ...ServerOption) (*Server, error) {
 		IsCoordinator: s.Cluster.Coordinator == s.NodeID,
 	}
 	s.Cluster.Node = node
+
+	// Append the NodeID tag to stats.
 	s.Holder.Stats = s.Holder.Stats.WithTags(fmt.Sprintf("NodeID:%s", s.NodeID))
 
 	s.executor.Holder = s.Holder
@@ -298,14 +301,6 @@ func (s *Server) Open() error {
 		log.Println(errors.Wrap(err, "logging startup"))
 	}
 
-	// Get or create NodeID.
-
-	// Append the NodeID tag to stats.
-
-	// Create default HTTP client
-
-	// Create executor for executing queries.
-
 	// Cluster settings.
 	s.Cluster.Broadcaster = s.Broadcaster
 	s.Cluster.MaxWritesPerRequest = s.maxWritesPerRequest

server/server.go

@@ -249,9 +249,6 @@ func (m *Command) SetupServer() error {
 
 // SetupNetworking sets up internode communication based on the configuration.
 func (m *Command) SetupNetworking() error {
-
-	m.Server.NodeID = m.Server.LoadNodeID()
-
 	if m.Config.Cluster.Disabled {
 		m.Server.Cluster.Static = true
 		m.Server.Cluster.Coordinator = m.Server.NodeID
@@ -265,9 +262,7 @@ func (m *Command) SetupNetworking() error {
 			})
 		}
 
-		m.Server.Broadcaster = pilosa.NopBroadcaster
 		m.Server.Cluster.MemberSet = pilosa.NewStaticMemberSet(m.Server.Cluster.Nodes)
-		m.Server.BroadcastReceiver = pilosa.NopBroadcastReceiver
 		return nil
 	}