zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-11-03 11:02:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

adjusted check for clients on non servers

Browse Source
This commit is contained in:
0xdcarns
2022-10-14 12:15:01 -04:00
parent 4a9e5580fa
commit e6d956c8a5
2 changed files with 3 additions and 1 deletions
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, TotalReceived: peers[j].ReceiveBytes,
TotalSent: peers[j].TransmitBytes, TotalSent: peers[j].TransmitBytes,
Connected: true, Connected: true,
Latency: -1, // can not determine latency on server currently
} }
} else { } else {
newServerMetrics.Connectivity[clients[i].ClientID] = models.Metric{ 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 // associate ext clients with IDs
for i := range attachedClients { for i := range attachedClients {
extMetric := newMetrics.Connectivity[attachedClients[i].PublicKey] 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) > 1 { // cover server clients
extMetric = newMetrics.Connectivity[attachedClients[i].ClientID] extMetric = newMetrics.Connectivity[attachedClients[i].ClientID]
if extMetric.TotalReceived > 0 && extMetric.TotalSent > 0 { if extMetric.TotalReceived > 0 && extMetric.TotalSent > 0 {
extMetric.Connected = true extMetric.Connected = true