Merge branch 'NET-10' of https://github.com/gravitl/netmaker into NET-164

controllers/hosts.go

@@ -355,7 +355,7 @@ func deleteHostFromNetwork(w http.ResponseWriter, r *http.Request) {
 
 	runUpdates(node, false)
 	go func() { // notify of peer change
-		go mq.BroadcastDelPeer(currHost, network)
+		mq.BroadcastDelPeer(currHost, network)
 		if err := mq.PublishDNSDelete(node, currHost); err != nil {
 			logger.Log(1, "error publishing dns update", err.Error())
 		}

controllers/node.go

@@ -749,6 +749,7 @@ func deleteNode(w http.ResponseWriter, r *http.Request) {
 		host, err := logic.GetHost(node.HostID.String())
 		if err != nil {
 			logger.Log(1, "failed to retrieve host for node", node.ID.String(), err.Error())
+			return
 		}
 
 		err = mq.BroadcastDelPeer(host, deletedNode.Network)

mq/publishers.go

@@ -122,17 +122,17 @@ func FlushNetworkPeersToHost(host *models.Host, hNode *models.Node, networkNodes
 		Action: models.RemovePeer,
 		Peers:  []wgtypes.PeerConfig{},
 	}
-	for _, nodeI := range networkNodes {
-		if nodeI.ID == hNode.ID {
+	for _, node := range networkNodes {
+		if node.ID == hNode.ID {
 			// skip self
 			continue
 		}
-		peerHost, err := logic.GetHost(nodeI.HostID.String())
+		peerHost, err := logic.GetHost(node.HostID.String())
 		if err != nil {
 			continue
 		}
 
-		if !nodeacls.AreNodesAllowed(nodeacls.NetworkID(nodeI.Network), nodeacls.NodeID(hNode.ID.String()), nodeacls.NodeID(nodeI.ID.String())) ||
+		if !nodeacls.AreNodesAllowed(nodeacls.NetworkID(node.Network), nodeacls.NodeID(hNode.ID.String()), nodeacls.NodeID(node.ID.String())) ||
 			hNode.Action == models.NODE_DELETE || hNode.PendingDelete || !hNode.Connected {
 			// remove peer if not allowed
 			rmPeerAction.Peers = append(rmPeerAction.Peers, wgtypes.PeerConfig{
@@ -148,9 +148,9 @@ func FlushNetworkPeersToHost(host *models.Host, hNode *models.Node, networkNodes
 				IP:   peerHost.EndpointIP,
 				Port: logic.GetPeerListenPort(peerHost),
 			},
-			PersistentKeepaliveInterval: &nodeI.PersistentKeepalive,
+			PersistentKeepaliveInterval: &node.PersistentKeepalive,
 			ReplaceAllowedIPs:           true,
-			AllowedIPs:                  logic.GetAllowedIPs(hNode, &nodeI, nil),
+			AllowedIPs:                  logic.GetAllowedIPs(hNode, &node, nil),
 		}
 		addPeerAction.Peers = append(addPeerAction.Peers, peerCfg)
 	}