gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-16 03:00:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1835 from nats-io/last_active

Browse Source 
Change over last to active and a duration
This commit is contained in:
Derek Collison
2021-01-22 13:36:48 -07:00
committed by GitHub
parent 00db4ba7a1 277483b386
commit 6970c25ca0
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/jetstream_cluster.go
View File

@@ -2918,10 +2918,13 @@ func (s *Server) clusterInfo(n RaftNode) *ClusterInfo {
Leader: s.serverNameForNode(n.GroupLeader()),
}
now := time.Now()
id, peers := n.ID(), n.Peers()
for _, rp := range peers {
if rp.ID != id {
ci.Replicas = append(ci.Replicas, &PeerInfo{Name: s.serverNameForNode(rp.ID), Current: rp.Current, Last: rp.Last})
pi := &PeerInfo{Name: s.serverNameForNode(rp.ID), Current: rp.Current, Active: now.Sub(rp.Last)}
ci.Replicas = append(ci.Replicas, pi)
}
}
return ci

6
server/stream.go
View File

@@ -94,9 +94,9 @@ type ClusterInfo struct {
// PeerInfo shows information about all the peers in the cluster that
// are supporting the stream or consumer.
type PeerInfo struct {
Name string `json:"name"`
Current bool `json:"current"`
Last time.Time `json:"last"`
Name string `json:"name"`
Current bool `json:"current"`
Active time.Duration `json:"active"`
}
// Stream is a jetstream stream of messages. When we receive a message internally destined