From 673d90728e02585448ba3f48f8244bcead5ecfe2 Mon Sep 17 00:00:00 2001 From: "marc.barry" Date: Wed, 21 May 2014 10:23:04 -0400 Subject: [PATCH] style(server): changed a LeaderInfo struct field from "startTime" to "StartTime" Changed the LeaderInfo struct "start time" field from "startTime" to "StartTime" so that it is an exported identifier. This required adding the `json:"startTime"` structure field tag so that the encoding/json package correctly performs JSON encoding (i.e. the correct property name --> startTime). --- server/peer_server.go | 2 +- server/raft_server_stats.go | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/peer_server.go b/server/peer_server.go index d7a11140008..cc52bb0eae6 100644 --- a/server/peer_server.go +++ b/server/peer_server.go @@ -626,7 +626,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 index 099d7d65aef..dea4a4cf23c 100644 --- 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))