remove extraneous methods

travisjeffery · May 11, 2017 · 075f73b · 075f73b
1 parent 8394c6b
commit 075f73b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/raft/leader.go b/raft/leader.go
@@ -9,11 +9,11 @@ import (
 
 // monitorLeadership is used to monitor if we acquire or lose our role as the
 // leader in the Raft cluster.
-func (b *Raft) monitorLeadership(raftEventCh <-chan bool, serfEventCh <-chan *jocko.ClusterMember) {
+func (b *Raft) monitorLeadership(notifyCh <-chan bool, serfEventCh <-chan *jocko.ClusterMember) {
 	var stopCh chan struct{}
 	for {
 		select {
-		case isLeader := <-raftEventCh:
+		case isLeader := <-notifyCh:
 			if isLeader {
 				stopCh = make(chan struct{})
 				go b.leaderLoop(stopCh, serfEventCh)
@@ -106,9 +106,10 @@ func (b *Raft) reconcileMember(member *jocko.ClusterMember) error {
 	var err error
 	switch member.Status {
 	case jocko.StatusAlive:
-		err = b.addRaftPeer(member)
+		addr := &net.TCPAddr{IP: net.ParseIP(member.IP), Port: member.RaftPort}
+		err = b.addPeer(addr.String())
 	case jocko.StatusLeft, jocko.StatusReap:
-		err = b.removeRaftPeer(member)
+		err = b.removePeer(member.IP)
 	}
 
 	if err != nil {
@@ -117,12 +118,3 @@ func (b *Raft) reconcileMember(member *jocko.ClusterMember) error {
 	}
 	return nil
 }
-
-func (b *Raft) addRaftPeer(member *jocko.ClusterMember) error {
-	addr := &net.TCPAddr{IP: net.ParseIP(member.IP), Port: member.RaftPort}
-	return b.addPeer(addr.String())
-}
-
-func (b *Raft) removeRaftPeer(member *jocko.ClusterMember) error {
-	return b.removePeer(member.IP)
-}
diff --git a/raft/raft.go b/raft/raft.go
@@ -86,8 +86,8 @@ func (b *Raft) Bootstrap(serf jocko.Serf, serfEventCh <-chan *jocko.ClusterMembe
 	}
 	b.store = boltStore
 
-	raftNotifyCh := make(chan bool, 1)
-	b.config.NotifyCh = raftNotifyCh
+	notifyCh := make(chan bool, 1)
+	b.config.NotifyCh = notifyCh
 	b.config.StartAsLeader = !b.devDisableBootstrap
 
 	fsm := &fsm{
@@ -104,7 +104,7 @@ func (b *Raft) Bootstrap(serf jocko.Serf, serfEventCh <-chan *jocko.ClusterMembe
 	b.raft = raft
 
 	// monitor leadership changes
-	go b.monitorLeadership(raftNotifyCh, serfEventCh)
+	go b.monitorLeadership(notifyCh, serfEventCh)
 
 	return nil
 }