gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-06 13:14:24 +08:00
Code Issues Projects Releases Packages Wiki Activity

NET-1497:set node lastcheckin after reboot (#3102)

Browse source 
* set node lastcheckin after reboot

* set node connected after reboot
This commit is contained in:
Max Ma 2024-09-16 16:41:11 +02:00 • committed by GitHub
parent 1903a49768
commit 19d4fbaa24
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
logic/nodes.go
View file

@ -393,7 +393,7 @@ func GetNetworkByNode(node *models.Node) (models.Network, error) {
}
// SetNodeDefaults - sets the defaults of a node to avoid empty fields
func SetNodeDefaults(node *models.Node) {
func SetNodeDefaults(node *models.Node, resetConnected bool) {
parentNetwork, _ := GetNetworkByNode(node)
_, cidr, err := net.ParseCIDR(parentNetwork.AddressRange)
@ -413,8 +413,12 @@ func SetNodeDefaults(node *models.Node) {
}
node.SetLastModified()
node.SetLastCheckIn()
node.SetDefaultConnected()
if node.LastCheckIn.IsZero() {
node.SetLastCheckIn()
}
if resetConnected {
node.SetDefaultConnected()
}
node.SetExpirationDateTime()
}
@ -461,7 +465,7 @@ func GetDeletedNodeByID(uuid string) (models.Node, error) {
return models.Node{}, err
}
SetNodeDefaults(&node)
SetNodeDefaults(&node, true)
return node, nil
}
@ -531,7 +535,7 @@ func createNode(node *models.Node) error {
}
}
SetNodeDefaults(node)
SetNodeDefaults(node, true)
defaultACLVal := acls.Allowed
parentNetwork, err := GetNetwork(node.Network)

2
serverctl/serverctl.go
View file

@ -40,7 +40,7 @@ func setNodeDefaults() error {
return err
}
for i := range nodes {
logic.SetNodeDefaults(&nodes[i])
logic.SetNodeDefaults(&nodes[i], false)
logic.UpdateNode(&nodes[i], &nodes[i])
currentNodeACL, err := nodeacls.FetchNodeACL(nodeacls.NetworkID(nodes[i].Network), nodeacls.NodeID(nodes[i].ID.String()))
if (err != nil && (database.IsEmptyRecord(err) || strings.Contains(err.Error(), "no node ACL present"))) || currentNodeACL == nil {