Browse Source

dont publish to updated node

afeiszli 3 years ago
parent
commit
6f9f97e4b7
2 changed files with 7 additions and 6 deletions
  1. 1 1
      mq/mq.go
  2. 6 5
      netclient/functions/daemon.go

+ 1 - 1
mq/mq.go

@@ -106,7 +106,7 @@ func PublishPeerUpdate(newNode *models.Node) error {
 	}
 	for _, node := range networkNodes {
 
-		if node.IsServer == "yes" {
+		if node.IsServer == "yes" || node.ID == newNode.ID {
 			continue
 		}
 		peerUpdate, err := logic.GetPeerUpdate(&node)

+ 6 - 5
netclient/functions/daemon.go

@@ -228,6 +228,12 @@ 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)
 			if err = Resubscribe(client, &cfg); err != nil {
 				ncutils.Log("error resubscribing after interface change " + err.Error())
 				return
@@ -284,11 +290,6 @@ func UpdatePeers(client mqtt.Client, msg mqtt.Message) {
 		ncutils.Log("update peer handler")
 
 		file := ncutils.GetNetclientPathSpecific() + cfg.Node.Interface + ".conf"
-		var shouldReSub = shouldResub(cfg.Node.NetworkSettings.DefaultServerAddrs, peerUpdate.ServerAddrs)
-		if shouldReSub {
-			Resubscribe(client, &cfg)
-			cfg.Node.NetworkSettings.DefaultServerAddrs = peerUpdate.ServerAddrs
-		}
 		err = wireguard.UpdateWgPeers(file, peerUpdate.Peers)
 		if err != nil {
 			ncutils.Log("error updating wireguard peers" + err.Error())