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

refactored delete, pull nil pointer and logging

Browse Source
This commit is contained in:
0xdcarns
2022-02-08 10:43:46 -05:00
parent a85a888251
commit 39cea2da6c
8 changed files with 57 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
controllers/node.go
View File

@@ -599,7 +599,12 @@ func deleteNode(w http.ResponseWriter, r *http.Request) {
}
//send update to node to be deleted before deleting on server otherwise message cannot be sent
node.Action = models.NODE_DELETE
runUpdates(&node, true)
if err := mq.NodeUpdate(&node); err != nil {
logger.Log(1, "error publishing node update", err.Error())
returnErrorResponse(w, r, formatError(err, "internal"))
return
}
err = logic.DeleteNodeByID(&node, false)
if err != nil {
returnErrorResponse(w, r, formatError(err, "internal"))
@@ -611,8 +616,8 @@ func deleteNode(w http.ResponseWriter, r *http.Request) {
return
}
logger.Log(1, r.Header.Get("user"), "Deleted node", nodeid, "from network", params["network"])
runUpdates(&node, false)
returnSuccessResponse(w, r, nodeid+" deleted.")
}
func runUpdates(node *models.Node, nodeUpdate bool) error {