diff --git a/controllers/node.go b/controllers/node.go index ab9cc533..602c0294 100644 --- a/controllers/node.go +++ b/controllers/node.go @@ -569,7 +569,7 @@ func updateNode(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) json.NewEncoder(w).Encode(newNode) - runUpdates(&node, true) + runUpdates(&newNode, true) } func deleteNode(w http.ResponseWriter, r *http.Request) { diff --git a/netclient/functions/daemon.go b/netclient/functions/daemon.go index e3d72c4f..dc555797 100644 --- a/netclient/functions/daemon.go +++ b/netclient/functions/daemon.go @@ -165,6 +165,9 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) { return } + log.Println("DELETE: new node addres: " + newNode.Address) + log.Println("DELETE: current node addres: " + cfg.Node.Address) + ncutils.Log("received message to update node " + newNode.Name) // see if cache hit, if so skip var currentMessage = read(newNode.Network, lastNodeUpdate) @@ -182,6 +185,7 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) { //ensure that OS never changes newNode.OS = runtime.GOOS // check if interface needs to delta + log.Println("DELETE: running ifacedelta") ifaceDelta := ncutils.IfaceDelta(&cfg.Node, &newNode) cfg.Node = newNode diff --git a/netclient/ncutils/iface.go b/netclient/ncutils/iface.go index 84a9f150..74c0dfcd 100644 --- a/netclient/ncutils/iface.go +++ b/netclient/ncutils/iface.go @@ -1,13 +1,14 @@ package ncutils -import "github.com/gravitl/netmaker/models" +import ( + "log" + + "github.com/gravitl/netmaker/models" +) func IfaceDelta(currentNode *models.Node, newNode *models.Node) bool { // single comparison statements - if currentNode.IsServer != "yes" { - return false - } - + log.Println("DELETE: checking stuff") if newNode.Endpoint != currentNode.Endpoint || newNode.LocalAddress != currentNode.LocalAddress || newNode.PublicKey != currentNode.PublicKey || @@ -57,7 +58,7 @@ func IfaceDelta(currentNode *models.Node, newNode *models.Node) bool { return true } } - + log.Println("DELETE: guess it's false") return false }