Merge pull request #807 from Shopify/raft-server-stats-struct-field-t…

…ag-fix style(server): changed a LeaderInfo struct field from "startTime" to "StartTime"
etcd-io · Jun 5, 2014 · fbcfe8e · fbcfe8e
2 parents 757bb3a + 673d907
commit fbcfe8e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/server/peer_server.go b/server/peer_server.go
@@ -627,7 +627,7 @@ func (s *PeerServer) joinByPeer(server raft.Server, peer string, scheme string)
 }
 
 func (s *PeerServer) Stats() []byte {
-	s.serverStats.LeaderInfo.Uptime = time.Now().Sub(s.serverStats.LeaderInfo.startTime).String()
+	s.serverStats.LeaderInfo.Uptime = time.Now().Sub(s.serverStats.LeaderInfo.StartTime).String()
 
 	// TODO: register state listener to raft to change this field
 	// rather than compare the state each time Stats() is called.

diff --git a/server/raft_server_stats.go b/server/raft_server_stats.go
@@ -13,9 +13,9 @@ type raftServerStats struct {
 	StartTime time.Time `json:"startTime"`
 
 	LeaderInfo struct {
-		Name      string `json:"leader"`
-		Uptime    string `json:"uptime"`
-		startTime time.Time
+		Name      string    `json:"leader"`
+		Uptime    string    `json:"uptime"`
+		StartTime time.Time `json:"startTime"`
 	} `json:"leaderInfo"`
 
 	RecvAppendRequestCnt uint64  `json:"recvAppendRequestCnt,"`
@@ -43,7 +43,7 @@ func NewRaftServerStats(name string) *raftServerStats {
 			back: -1,
 		},
 	}
-	stats.LeaderInfo.startTime = time.Now()
+	stats.LeaderInfo.StartTime = time.Now()
 	return stats
 }
 
@@ -54,7 +54,7 @@ func (ss *raftServerStats) RecvAppendReq(leaderName string, pkgSize int) {
 	ss.State = raft.Follower
 	if leaderName != ss.LeaderInfo.Name {
 		ss.LeaderInfo.Name = leaderName
-		ss.LeaderInfo.startTime = time.Now()
+		ss.LeaderInfo.StartTime = time.Now()
 	}
 
 	ss.recvRateQueue.Insert(NewPackageStats(time.Now(), pkgSize))
@@ -70,7 +70,7 @@ func (ss *raftServerStats) SendAppendReq(pkgSize int) {
 	if ss.State != raft.Leader {
 		ss.State = raft.Leader
 		ss.LeaderInfo.Name = ss.Name
-		ss.LeaderInfo.startTime = now
+		ss.LeaderInfo.StartTime = now
 	}
 
 	ss.sendRateQueue.Insert(NewPackageStats(now, pkgSize))