diff --git a/controllers/node_grpc.go b/controllers/node_grpc.go index 1a00b9c3..1b2387e4 100644 --- a/controllers/node_grpc.go +++ b/controllers/node_grpc.go @@ -151,7 +151,7 @@ func getServerAddrs(node *models.Node) { ID: serverNode.ID, }, } - networkSettings, _ := logic.GetNetworkSettings(node.Network) + networkSettings, _ := logic.GetParentNetwork(node.Network) // TODO consolidate functionality around files networkSettings.NodesLastModified = time.Now().Unix() networkSettings.DefaultServerAddrs = serverAddrs diff --git a/netclient/functions/daemon.go b/netclient/functions/daemon.go index 943e924a..d7c0c801 100644 --- a/netclient/functions/daemon.go +++ b/netclient/functions/daemon.go @@ -165,9 +165,6 @@ 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) @@ -185,7 +182,6 @@ 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 @@ -228,12 +224,7 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) { ncutils.Log("error restarting wg after node update " + err.Error()) return } - log.Println("DELETE: sleeepy time") - log.Println("DELETE: sleeepy time") - log.Println("DELETE: sleeepy time") - log.Println("DELETE: sleeepy time") - - time.Sleep(time.Second * 5) + time.Sleep(time.Second >> 1) if err = Resubscribe(client, &cfg); err != nil { ncutils.Log("error resubscribing after interface change " + err.Error()) return diff --git a/netclient/ncutils/iface.go b/netclient/ncutils/iface.go index 74c0dfcd..90a4ba7c 100644 --- a/netclient/ncutils/iface.go +++ b/netclient/ncutils/iface.go @@ -1,14 +1,11 @@ package ncutils import ( - "log" - "github.com/gravitl/netmaker/models" ) func IfaceDelta(currentNode *models.Node, newNode *models.Node) bool { // single comparison statements - log.Println("DELETE: checking stuff") if newNode.Endpoint != currentNode.Endpoint || newNode.LocalAddress != currentNode.LocalAddress || newNode.PublicKey != currentNode.PublicKey || @@ -58,7 +55,6 @@ func IfaceDelta(currentNode *models.Node, newNode *models.Node) bool { return true } } - log.Println("DELETE: guess it's false") return false }