From 5d498918bf6b0e0874265f9f3ee5b9f2a6ab5ef7 Mon Sep 17 00:00:00 2001
From: Xiang Li <xiang.li@coreos.com>
Date: Fri, 18 Jul 2014 08:44:43 -0700
Subject: [PATCH] etcd: abstract out mode change logic

---
 etcd/etcd.go | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/etcd/etcd.go b/etcd/etcd.go
index 6a6f29980..d7dc177e8 100644
--- a/etcd/etcd.go
+++ b/etcd/etcd.go
@@ -129,22 +129,20 @@ func (s *Server) ServeRaftHTTP(w http.ResponseWriter, r *http.Request) {
 func (s *Server) Run() {
 	next := participantMode
 	for {
+		s.modeC <- next
 		switch next {
 		case participantMode:
 			s.p = newParticipant(s.id, s.pubAddr, s.raftPubAddr, s.nodes, s.client, s.peerHub, s.tickDuration)
 			s.mode.Set(participantMode)
-			s.modeC <- s.mode.Get()
 			// TODO: it may block here. move modeC later.
 			next = s.p.run()
 		case standbyMode:
 			s.s = newStandby(s.id, s.pubAddr, s.raftPubAddr, s.nodes, s.client, s.peerHub)
 			s.mode.Set(standbyMode)
-			s.modeC <- s.mode.Get()
 			next = s.s.run()
 		case stopMode:
 			s.client.CloseConnections()
 			s.peerHub.stop()
-			s.modeC <- s.mode.Get()
 			s.stopc <- struct{}{}
 			return
 		default: