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

merge conflicts resolved

Browse Source
This commit is contained in:
Abhishek Kondur
2022-12-02 10:08:01 +05:30
parent 058d80c709 407c6ed20a
commit 5b7ead91e6
23 changed files with 398 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
logic/server.go
View File

@@ -208,7 +208,7 @@ func ServerUpdate(serverNode *models.Node, ifaceDelta bool) error {
var err = ServerPull(serverNode, ifaceDelta)
if isDeleteError(err) {
return DeleteNodeByID(serverNode, true)
return DeleteNode(serverNode, true)
} else if err != nil && !ifaceDelta {
err = ServerPull(serverNode, true)
if err != nil {
@@ -239,7 +239,7 @@ func checkNodeActions(node *models.Node) string {
}
}
if node.Action == models.NODE_DELETE {
err := DeleteNodeByID(node, true)
err := DeleteNode(node, true)
if err != nil {
logger.Log(1, "error deleting locally:", err.Error())
}