gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2024-09-21 15:56:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixing peer locs

Browse source
This commit is contained in:
afeiszli 2022-01-31 15:37:57 -05:00
parent d9c44035a7
commit 09c2f9bf8b
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
netclient/functions/daemon.go
View file

@ -191,7 +191,7 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
ncutils.PrintLog("error deleting local instance: "+err.Error(), 1) ncutils.PrintLog("error deleting local instance: "+err.Error(), 1)
return return
} }
if token := client.Unsubscribe("update/"+newNode.ID, "update/peers/"+newNode.ID); token.Wait() && token.Error() != nil { if token := client.Unsubscribe(fmt.Sprintf("update/%s/%s", newNode.Network, newNode.ID), fmt.Sprintf("peers/%s/%s", newNode.Network, newNode.ID)); token.Wait() && token.Error() != nil {
ncutils.PrintLog("error unsubscribing during node deletion", 1) ncutils.PrintLog("error unsubscribing during node deletion", 1)
} }
return return
@ -253,7 +253,7 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
}() }()
} }
// UpdatePeers -- mqtt message handler for /update/peers/<NodeID> topic // UpdatePeers -- mqtt message handler for peers/<Network>/<NodeID> topic
func UpdatePeers(client mqtt.Client, msg mqtt.Message) { func UpdatePeers(client mqtt.Client, msg mqtt.Message) {
go func() { go func() {
var peerUpdate models.PeerUpdate var peerUpdate models.PeerUpdate
@ -336,13 +336,13 @@ func Resubscribe(client mqtt.Client, cfg *config.ClientConfig) error {
ncutils.Log("resubbing on network " + cfg.Node.Network) ncutils.Log("resubbing on network " + cfg.Node.Network)
client.Disconnect(250) client.Disconnect(250)
client = SetupMQTT(cfg) client = SetupMQTT(cfg)
if token := client.Subscribe("update/"+cfg.Node.ID, 0, NodeUpdate); token.Wait() && token.Error() != nil { if token := client.Subscribe(fmt.Sprintf("update/%s/%s", cfg.Node.Network, cfg.Node.ID), 0, NodeUpdate); token.Wait() && token.Error() != nil {
log.Fatal(token.Error()) log.Fatal(token.Error())
} }
if cfg.DebugOn { if cfg.DebugOn {
ncutils.Log("subscribed to node updates for node " + cfg.Node.Name + " update/" + cfg.Node.ID) ncutils.Log("subscribed to node updates for node " + cfg.Node.Name + " update/" + cfg.Node.ID)
} }
if token := client.Subscribe("update/peers/"+cfg.Node.ID, 0, UpdatePeers); token.Wait() && token.Error() != nil { if token := client.Subscribe(fmt.Sprintf("peers/%s/%s", cfg.Node.Network, cfg.Node.ID), 0, UpdatePeers); token.Wait() && token.Error() != nil {
log.Fatal(token.Error()) log.Fatal(token.Error())
} }
var id string var id string

4
netclient/wireguard/unix.go
View file

@ -60,11 +60,11 @@ func ApplyWGQuickConf(confPath string) error {
} }
_, err = ncutils.RunCmd("wg-quick down "+confPath, true) _, err = ncutils.RunCmd("wg-quick down "+confPath, true)
if err != nil { if err != nil {
ncutils.Log("err runing wg-quick down " + confPath + err.Error()) ncutils.Log("err running wg-quick down " + confPath + ": " + err.Error())
} }
_, err = ncutils.RunCmd("wg-quick up "+confPath, true) _, err = ncutils.RunCmd("wg-quick up "+confPath, true)
if err != nil { if err != nil {
ncutils.Log("err runing wg-quick up " + confPath + err.Error()) ncutils.Log("err runinng wg-quick up " + confPath + ": " + err.Error())
} }
return err return err
} }