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 #1886 from gravitl/netclient_refactor_fixes

Browse source 
Netclient refactor fixes
This commit is contained in:
dcarns 2022-12-30 09:26:02 -05:00 committed by GitHub
parent e1929dd039 7455bf7d6c
commit f382fd3bf9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
controllers/node.go
View file

@ -1089,7 +1089,14 @@ func deleteNode(w http.ResponseWriter, r *http.Request) {
logger.Log(1, r.Header.Get("user"), "Deleted node", nodeid, "from network", params["network"]) logger.Log(1, r.Header.Get("user"), "Deleted node", nodeid, "from network", params["network"])
if !fromNode { if !fromNode {
runUpdates(&node, false) runUpdates(&node, false)
return
} }
go func() {
if err := mq.PublishPeerUpdate(node.Network, false); err != nil {
logger.Log(1, "error publishing peer update ", err.Error())
return
}
}()
} }

2
logic/nodes.go
View file

@ -243,7 +243,7 @@ func SetNodeDefaults(node *models.Node) {
} }
if node.PersistentKeepalive == 0 { if node.PersistentKeepalive == 0 {
node.PersistentKeepalive = time.Duration(parentNetwork.DefaultKeepalive) node.PersistentKeepalive = time.Second * time.Duration(parentNetwork.DefaultKeepalive)
} }
if node.PostUp == "" { if node.PostUp == "" {
postup := parentNetwork.DefaultPostUp postup := parentNetwork.DefaultPostUp

4
models/api_node.go
View file

@ -69,7 +69,7 @@ func (a *ApiNode) ConvertToServerNode(currentNode *Node) *Node {
convertedNode.DNSOn = a.DNSOn convertedNode.DNSOn = a.DNSOn
convertedNode.EgressGatewayRequest = currentNode.EgressGatewayRequest convertedNode.EgressGatewayRequest = currentNode.EgressGatewayRequest
convertedNode.EgressGatewayNatEnabled = currentNode.EgressGatewayNatEnabled convertedNode.EgressGatewayNatEnabled = currentNode.EgressGatewayNatEnabled
convertedNode.PersistentKeepalive = time.Duration(a.PersistentKeepalive) convertedNode.PersistentKeepalive = time.Second * time.Duration(a.PersistentKeepalive)
convertedNode.RelayAddrs = a.RelayAddrs convertedNode.RelayAddrs = a.RelayAddrs
convertedNode.DefaultACL = a.DefaultACL convertedNode.DefaultACL = a.DefaultACL
convertedNode.OwnerID = currentNode.OwnerID convertedNode.OwnerID = currentNode.OwnerID
@ -128,7 +128,7 @@ func (nm *Node) ConvertToAPINode() *ApiNode {
} }
apiNode.PostDown = nm.PostDown apiNode.PostDown = nm.PostDown
apiNode.PostUp = nm.PostUp apiNode.PostUp = nm.PostUp
apiNode.PersistentKeepalive = int32(nm.PersistentKeepalive) apiNode.PersistentKeepalive = int32(nm.PersistentKeepalive.Seconds())
apiNode.LastModified = nm.LastModified.Unix() apiNode.LastModified = nm.LastModified.Unix()
apiNode.LastCheckIn = nm.LastCheckIn.Unix() apiNode.LastCheckIn = nm.LastCheckIn.Unix()
apiNode.LastPeerUpdate = nm.LastPeerUpdate.Unix() apiNode.LastPeerUpdate = nm.LastPeerUpdate.Unix()