mirror of
https://github.com/gravitl/netmaker.git
synced 2025-10-05 08:47:35 +08:00
fix node update
This commit is contained in:
@@ -7,7 +7,6 @@ import (
|
||||
"net/http"
|
||||
"strings"
|
||||
|
||||
"github.com/google/uuid"
|
||||
"github.com/gorilla/mux"
|
||||
proxy_models "github.com/gravitl/netclient/nmproxy/models"
|
||||
"github.com/gravitl/netmaker/database"
|
||||
@@ -1069,28 +1068,14 @@ func deleteNode(w http.ResponseWriter, r *http.Request) {
|
||||
}, &node)
|
||||
}
|
||||
if fromNode {
|
||||
// check if server should be removed from mq
|
||||
// err is irrelevent
|
||||
nodes, _ := logic.GetAllNodes()
|
||||
var foundNode models.Node
|
||||
for _, nodetocheck := range nodes {
|
||||
if nodetocheck.HostID == node.HostID {
|
||||
foundNode = nodetocheck
|
||||
break
|
||||
}
|
||||
}
|
||||
// TODO: Address how to remove host
|
||||
if foundNode.HostID != uuid.Nil {
|
||||
if err = logic.DissasociateNodeFromHost(&foundNode, host); err == nil {
|
||||
currNets := logic.GetHostNetworks(host.ID.String())
|
||||
if len(currNets) > 0 {
|
||||
mq.ModifyClient(&mq.MqClient{
|
||||
ID: host.ID.String(),
|
||||
Text: host.Name,
|
||||
Networks: currNets,
|
||||
})
|
||||
}
|
||||
}
|
||||
// update networks for host mq client
|
||||
currNets := logic.GetHostNetworks(host.ID.String())
|
||||
if len(currNets) > 0 {
|
||||
mq.ModifyClient(&mq.MqClient{
|
||||
ID: host.ID.String(),
|
||||
Text: host.Name,
|
||||
Networks: currNets,
|
||||
})
|
||||
}
|
||||
}
|
||||
logic.ReturnSuccessResponse(w, r, nodeid+" deleted.")
|
||||
@@ -1099,12 +1084,11 @@ func deleteNode(w http.ResponseWriter, r *http.Request) {
|
||||
runUpdates(&node, false)
|
||||
return
|
||||
}
|
||||
go func() {
|
||||
if err := mq.PublishPeerUpdate(node.Network, false); err != nil {
|
||||
go func(network string) {
|
||||
if err := mq.PublishPeerUpdate(network, false); err != nil {
|
||||
logger.Log(1, "error publishing peer update ", err.Error())
|
||||
return
|
||||
}
|
||||
}()
|
||||
}(node.Network)
|
||||
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user