Browse Source

adjusted check for clients on non servers

0xdcarns 2 years ago
parent
commit
e6d956c8a5
2 changed files with 3 additions and 1 deletions
  1. 1 0
      logic/metrics.go
  2. 2 1
      mq/handlers.go

+ 1 - 0
logic/metrics.go

@@ -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{

+ 2 - 1
mq/handlers.go

@@ -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) > 1 { // cover server clients
 				extMetric = newMetrics.Connectivity[attachedClients[i].ClientID]
 				if extMetric.TotalReceived > 0 && extMetric.TotalSent > 0 {
 					extMetric.Connected = true