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

Move the metadata parsing code to node.go

This commit is contained in:
kaiyou 2020-05-06 19:38:49 +02:00 committed by Leo Antunes
parent 0e799d6074
commit b0bfeb1f8e
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main.go
View File

@ -66,18 +66,7 @@ func main() {
for { for {
select { select {
case rawNodes := <-nodec: case rawNodes := <-nodec:
logrus.Info("cluster members:\n") nodes := parseNodesMeta(rawNodes)
nodes := make([]node, 0)
for _, node := range rawNodes {
meta, err := decodeNodeMeta(node.Meta)
if err != nil {
logrus.Warnf("\t addr: %s, could not decode metadata", node.Addr)
continue
}
node.nodeMeta = meta
nodes = append(nodes, node)
logrus.Infof("\taddr: %s, overlay: %s, pubkey: %s", node.Addr, node.OverlayAddr, node.PubKey)
}
if err := wg.setUpInterface(nodes); err != nil { if err := wg.setUpInterface(nodes); err != nil {
logrus.WithError(err).Error("could not up interface") logrus.WithError(err).Error("could not up interface")
wg.downInterface() wg.downInterface()

16
node.go
View File

@ -49,3 +49,19 @@ func decodeNodeMeta(b []byte) (nodeMeta, error) {
} }
return nm, nil return nm, nil
} }
func parseNodesMeta(rawNodes []node) []node {
logrus.Info("cluster members:\n")
nodes := make([]node, 0)
for _, node := range rawNodes {
meta, err := decodeNodeMeta(node.Meta)
if err != nil {
logrus.Warnf("\t addr: %s, could not decode metadata", node.Addr)
continue
}
node.nodeMeta = meta
nodes = append(nodes, node)
logrus.Infof("\taddr: %s, overlay: %s, pubkey: %s", node.Addr, node.OverlayAddr, node.PubKey)
}
return nodes
}