Browse Source

chore(standby_server): still sleep for the first time

Yicheng Qin 11 years ago
parent
commit
716496ec42
1 changed files with 8 additions and 10 deletions
  1. 8 10
      server/standby_server.go

+ 8 - 10
server/standby_server.go

@@ -168,19 +168,17 @@ func (s *StandbyServer) redirectRequests(w http.ResponseWriter, r *http.Request)
 	uhttp.Redirect(leader.ClientURL, w, r)
 }
 
+// monitorCluster assumes that the machine has tried to join the cluster and
+// failed, so it waits for the interval at the beginning.
 func (s *StandbyServer) monitorCluster() {
-	first := true
 	for {
-		if !first {
-			timer := time.NewTimer(time.Duration(int64(s.syncInterval * float64(time.Second))))
-			defer timer.Stop()
-			select {
-			case <-s.closeChan:
-				return
-			case <-timer.C:
-			}
+		timer := time.NewTimer(time.Duration(int64(s.syncInterval * float64(time.Second))))
+		defer timer.Stop()
+		select {
+		case <-s.closeChan:
+			return
+		case <-timer.C:
 		}
-		first = false
 
 		if err := s.syncCluster(nil); err != nil {
 			log.Warnf("fail syncing cluster(%v): %v", s.Cluster(), err)