From 1b2aaa26bf13c1b42b902a09ff125eee7ca32080 Mon Sep 17 00:00:00 2001 From: Matt Jaffee Date: Thu, 5 Jul 2018 09:26:58 -0500 Subject: [PATCH] export NodeEvent --- broadcast.go | 2 +- cluster.go | 14 +++++++------- event.go | 4 ++-- server.go | 2 +- utils_internal_test.go | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/broadcast.go b/broadcast.go index 0a33d4ca7..d3c4a2562 100644 --- a/broadcast.go +++ b/broadcast.go @@ -148,7 +148,7 @@ func encode(m Message) proto.Message { return encodeNodeStateMessage(mt) case *RecalculateCaches: return encodeRecalculateCaches(mt) - case *nodeEvent: + case *NodeEvent: return encodeNodeEventMessage(mt) case *NodeStatus: return encodeNodeStatus(mt) diff --git a/cluster.go b/cluster.go index e97ba46e4..2d25ebeaa 100644 --- a/cluster.go +++ b/cluster.go @@ -856,7 +856,7 @@ func (c *cluster) waitForStarted() error { // TODO: Because the normal code path already sends a NodeJoin event (via // memberlist), this it a bit redundant in most cases. Perhaps determine // that the node has been restarted and don't do this step. - msg := &nodeEvent{ + msg := &NodeEvent{ Event: NodeJoin, Node: c.Node, } @@ -1540,7 +1540,7 @@ func (c *cluster) considerTopology() error { } // ReceiveEvent represents an implementation of EventHandler. -func (c *cluster) ReceiveEvent(e *nodeEvent) error { +func (c *cluster) ReceiveEvent(e *NodeEvent) error { // Ignore events sent from this node. if e.Node.ID == c.Node.ID { return nil @@ -1966,8 +1966,8 @@ func DecodeNode(node *internal.Node) *Node { } } -func DecodeNodeEvent(ne *internal.NodeEventMessage) *nodeEvent { - return &nodeEvent{ +func DecodeNodeEvent(ne *internal.NodeEventMessage) *NodeEvent { + return &NodeEvent{ Event: NodeEventType(ne.Event), Node: DecodeNode(ne.Node), } @@ -2223,15 +2223,15 @@ func decodeNodeStateMessage(pb *internal.NodeStateMessage) *NodeStateMessage { } } -func encodeNodeEventMessage(m *nodeEvent) *internal.NodeEventMessage { +func encodeNodeEventMessage(m *NodeEvent) *internal.NodeEventMessage { return &internal.NodeEventMessage{ Event: uint32(m.Event), Node: EncodeNode(m.Node), } } -func decodeNodeEventMessage(pb *internal.NodeEventMessage) *nodeEvent { - return &nodeEvent{ +func decodeNodeEventMessage(pb *internal.NodeEventMessage) *NodeEvent { + return &NodeEvent{ Event: NodeEventType(pb.Event), Node: DecodeNode(pb.Node), } diff --git a/event.go b/event.go index aa1e0e890..0d5e59e99 100644 --- a/event.go +++ b/event.go @@ -23,8 +23,8 @@ const ( NodeUpdate ) -// nodeEvent is a single event related to node activity in the cluster. -type nodeEvent struct { +// NodeEvent is a single event related to node activity in the cluster. +type NodeEvent struct { Event NodeEventType Node *Node } diff --git a/server.go b/server.go index 7199b7178..b57935acb 100644 --- a/server.go +++ b/server.go @@ -506,7 +506,7 @@ func (s *Server) receiveMessage(m Message) error { } case *RecalculateCaches: s.holder.RecalculateCaches() - case *nodeEvent: + case *NodeEvent: s.cluster.ReceiveEvent(obj) case *NodeStatus: s.handleRemoteStatus(obj) diff --git a/utils_internal_test.go b/utils_internal_test.go index f7c11d6a7..4b9f6870a 100644 --- a/utils_internal_test.go +++ b/utils_internal_test.go @@ -161,7 +161,7 @@ func (t *ClusterCluster) addNode() error { // Send NodeJoin event to coordinator. if id > 0 { coord := t.Clusters[0] - ev := &nodeEvent{ + ev := &NodeEvent{ Event: NodeJoin, Node: c.Node, }