gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-09 13:26:52 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #665 from gravitl/bugfix_v0.10.0_delete_node

Browse source 
fix delete node, publish message to node to be dleted before updating…
This commit is contained in:
dcarns 2022-02-03 08:33:05 -05:00 • committed by GitHub
commit 844028b07c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
controllers/node.go
View file

@ -589,6 +589,9 @@ func deleteNode(w http.ResponseWriter, r *http.Request) {
returnErrorResponse(w, r, formatError(fmt.Errorf("cannot delete server node"), "badrequest")) returnErrorResponse(w, r, formatError(fmt.Errorf("cannot delete server node"), "badrequest"))
return return
} }
//send update to node to be deleted before deleting on server otherwise message cannot be sent
node.Action = models.NODE_DELETE
runUpdates(&node, true)
err = logic.DeleteNodeByID(&node, false) err = logic.DeleteNodeByID(&node, false)
if err != nil { if err != nil {
returnErrorResponse(w, r, formatError(err, "internal")) returnErrorResponse(w, r, formatError(err, "internal"))
@ -599,11 +602,9 @@ func deleteNode(w http.ResponseWriter, r *http.Request) {
returnErrorResponse(w, r, formatError(err, "internal")) returnErrorResponse(w, r, formatError(err, "internal"))
return return
} }
node.Action = models.NODE_DELETE
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"])
returnSuccessResponse(w, r, nodeid+" deleted.") returnSuccessResponse(w, r, nodeid+" deleted.")
runUpdates(&node, true)
} }
func runUpdates(node *models.Node, nodeUpdate bool) error { func runUpdates(node *models.Node, nodeUpdate bool) error {