ResiLien/wesher
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reinstante cluster.LocalNode

Browse Source 
This makes for more straightforward calls. Also, generate
the localNode directly in wg.New.
This commit is contained in:
kaiyou
2020-05-12 19:10:25 +02:00
committed by Leo Antunes
parent a0aa0bcc0e
commit e9b9239eae
3 changed files with 22 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main.go
View File

@ -39,7 +39,7 @@ func main() {
if err != nil {
logrus.WithError(err).Fatal("could not create cluster")
}
wgstate, err := wg.New(config.Interface, config.WireguardPort, (*net.IPNet)(config.OverlayNet), cluster.Name())
wgstate, localNode, err := wg.New(config.Interface, config.WireguardPort, (*net.IPNet)(config.OverlayNet), cluster.LocalName)
if err != nil {
logrus.WithError(err).Fatal("could not instantiate wireguard controller")
}
@ -49,13 +49,8 @@ func main() {
Logger: logrus.StandardLogger(),
}
// Assign a local node address and propagate it to the cluster
localNode := &common.Node{}
wgstate.UpdateNode(localNode)
cluster.SetLocalNode(localNode)
cluster.Update()
// Join the cluster
cluster.Update(localNode)
nodec := cluster.Members() // avoid deadlocks by starting before join
if err := backoff.RetryNotify(
func() error { return cluster.Join(config.Join) },