Merge pull request #1886 from gravitl/netclient_refactor_fixes

Netclient refactor fixes

controllers/node.go

@@ -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"])
 	if !fromNode {
 		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
+		}
+	}()
 
 }
 

logic/nodes.go

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

models/api_node.go

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