gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2024-09-20 23:36:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1657 from gravitl/bugfix_v0.16.2_client_metrics

Browse source 
adjusted check for clients on non servers
This commit is contained in:
dcarns 2022-10-17 11:21:24 -04:00 committed by GitHub
parent 4a30b63959 90451adf9e
commit ebbc057b58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
logic/metrics.go
View file

@ -83,6 +83,7 @@ func CollectServerMetrics(serverID string, networkNodes []models.Node) *models.M
TotalReceived: peers[j].ReceiveBytes,
TotalSent: peers[j].TransmitBytes,
Connected: true,
Latency: -1, // can not determine latency on server currently
}
} else {
newServerMetrics.Connectivity[clients[i].ClientID] = models.Metric{

3
mq/handlers.go
View file

@ -242,7 +242,8 @@ func updateNodeMetrics(currentNode *models.Node, newMetrics *models.Metrics) boo
// associate ext clients with IDs
for i := range attachedClients {
extMetric := newMetrics.Connectivity[attachedClients[i].PublicKey]
if len(extMetric.NodeName) == 0 { // cover server clients
if len(extMetric.NodeName) == 0 &&
len(newMetrics.Connectivity[attachedClients[i].ClientID].NodeName) > 0 { // cover server clients
extMetric = newMetrics.Connectivity[attachedClients[i].ClientID]
if extMetric.TotalReceived > 0 && extMetric.TotalSent > 0 {
extMetric.Connected = true