zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-05 08:47:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

unset relay fields before node deletion

Browse Source
This commit is contained in:
Abhishek Kondur
2023-06-30 17:16:37 +05:30
parent 58091189e4
commit 90c372b008
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
controllers/node.go
View File

@@ -740,10 +740,6 @@ func deleteNode(w http.ResponseWriter, r *http.Request) {
return return
} }
} }
if err := logic.DeleteNode(&node, fromNode); err != nil {
logic.ReturnErrorResponse(w, r, logic.FormatError(fmt.Errorf("failed to delete node"), "internal"))
return
}
if node.IsRelayed { if node.IsRelayed {
// cleanup node from relayednodes on relay node // cleanup node from relayednodes on relay node
relayNode, err := logic.GetNodeByID(node.RelayedBy) relayNode, err := logic.GetNodeByID(node.RelayedBy)
@@ -764,6 +760,11 @@ func deleteNode(w http.ResponseWriter, r *http.Request) {
// unset all the relayed nodes // unset all the relayed nodes
logic.SetRelayedNodes(false, node.ID.String(), node.RelayedNodes) logic.SetRelayedNodes(false, node.ID.String(), node.RelayedNodes)
} }
if err := logic.DeleteNode(&node, fromNode); err != nil {
logic.ReturnErrorResponse(w, r, logic.FormatError(fmt.Errorf("failed to delete node"), "internal"))
return
}
logic.ReturnSuccessResponse(w, r, nodeid+" deleted.") logic.ReturnSuccessResponse(w, r, nodeid+" deleted.")
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 { // notify node change if !fromNode { // notify node change