Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

style(server): changed a LeaderInfo struct field from "startTime" to "StartTime" #807

Merged
merged 1 commit into from
Jun 5, 2014
Merged

style(server): changed a LeaderInfo struct field from "startTime" to "StartTime" #807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/peer_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
12 changes: 6 additions & 6 deletions server/raft_server_stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,"`
Expand Down Expand Up @@ -43,7 +43,7 @@ func NewRaftServerStats(name string) *raftServerStats {
back: -1,
},
}
stats.LeaderInfo.startTime = time.Now()
stats.LeaderInfo.StartTime = time.Now()
return stats
}

Expand All @@ -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))
Expand All @@ -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))
Expand Down