Forráskód Böngészése

Merge branch 'release-v0.30.0' into NET-1986

Vishal Dalwadi 5 hónapja
szülő
commit
7b74ff5dbb
3 módosított fájl, 6 hozzáadás és 6 törlés
  1. 3 3
      logic/extpeers.go
  2. 2 2
      logic/hosts.go
  3. 1 1
      logic/nodes.go

+ 3 - 3
logic/extpeers.go

@@ -426,10 +426,10 @@ func GetAllExtClientsWithStatus(status models.NodeStatus) ([]models.ExtClient, e
 
 	var validExtClients []models.ExtClient
 	for _, extClient := range extClients {
-		nodes := []models.Node{extClient.ConvertToStaticNode()}
-		AddStatusToNodes(nodes)
+		node := extClient.ConvertToStaticNode()
+		getNodeStatus(&node, false)
 
-		if nodes[0].Status == status {
+		if node.Status == status {
 			validExtClients = append(validExtClients, extClient)
 		}
 	}

+ 2 - 2
logic/hosts.go

@@ -120,9 +120,9 @@ func GetAllHostsWithStatus(status models.NodeStatus) ([]models.Host, error) {
 			continue
 		}
 
-		nodes := AddStatusToNodes(GetHostNodes(&host))
-
+		nodes := GetHostNodes(&host)
 		for _, node := range nodes {
+			getNodeStatus(&node, false)
 			if node.Status == status {
 				validHosts = append(validHosts, host)
 				break

+ 1 - 1
logic/nodes.go

@@ -506,7 +506,7 @@ func SetNodeDefaults(node *models.Node, resetConnected bool) {
 	}
 
 	node.SetLastModified()
-	node.SetLastCheckIn()
+	//node.SetLastCheckIn()
 
 	if resetConnected {
 		node.SetDefaultConnected()