From b0bfeb1f8e42b95ab82ea854b98e5441e43e719e Mon Sep 17 00:00:00 2001 From: kaiyou Date: Wed, 6 May 2020 19:38:49 +0200 Subject: [PATCH] Move the metadata parsing code to node.go --- main.go | 13 +------------ node.go | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/main.go b/main.go index 13c4565..4910346 100644 --- a/main.go +++ b/main.go @@ -66,18 +66,7 @@ func main() { for { select { case rawNodes := <-nodec: - 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) - } + nodes := parseNodesMeta(rawNodes) if err := wg.setUpInterface(nodes); err != nil { logrus.WithError(err).Error("could not up interface") wg.downInterface() diff --git a/node.go b/node.go index 49da3fc..6b106b5 100644 --- a/node.go +++ b/node.go @@ -49,3 +49,19 @@ func decodeNodeMeta(b []byte) (nodeMeta, error) { } 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 +}