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

dont publish to updated node

Browse Source
This commit is contained in:
afeiszli
2022-01-31 16:15:10 -05:00
parent 3964d927ea
commit 6f9f97e4b7
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mq/mq.go
View File

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

11
netclient/functions/daemon.go
View File

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