Request all data types at once

data/response.go

@@ -0,0 +1,7 @@
+package data
+
+type ResponseData struct {
+	Neighbours *Neighbours `json:"neighbours"`
+	NodeInfo   *NodeInfo   `json:"nodeinfo"`
+	Statistics *Statistics `json:"statistics"`
+}

main.go

@@ -20,7 +20,7 @@ var (
 	configFile       string
 	config           *models.Config
 	wsserverForNodes *websocketserver.Server
-	multiCollector   *respond.MultiCollector
+	collector        *respond.Collector
 	statsDb          *StatsDb
 	nodes            = models.NewNodes()
 	//aliases          = models.NewNodes()
@@ -49,7 +49,7 @@ func main() {
 
 	if config.Respondd.Enable {
 		collectInterval := time.Second * time.Duration(config.Respondd.CollectInterval)
-		multiCollector = respond.NewMultiCollector(collectInterval, onReceive)
+		collector = respond.NewCollector("nodeinfo statistics neighbours", collectInterval, onReceive)
 	}
 
 	// TODO bad
@@ -67,8 +67,8 @@ func main() {
 	if wsserverForNodes != nil {
 		wsserverForNodes.Close()
 	}
-	if multiCollector != nil {
+	if collector != nil {
-		multiCollector.Close()
+		collector.Close()
 	}
 	if statsDb != nil {
 		statsDb.Close()
@@ -76,24 +76,21 @@ func main() {
 }
 
 // called for every parsed announced-message
-func onReceive(addr net.UDPAddr, msg interface{}) {
+func onReceive(addr net.UDPAddr, res *data.ResponseData) {
-	switch msg := msg.(type) {
 
-	case *data.NodeInfo:
+	if val := res.Neighbours; val != nil {
-		nodes.Get(msg.NodeId).Nodeinfo = msg
+		nodes.Get(val.NodeId).Neighbours = val
+	}
 
-	case *data.Neighbours:
+	if val := res.NodeInfo; val != nil {
-		nodes.Get(msg.NodeId).Neighbours = msg
+		nodes.Get(val.NodeId).Nodeinfo = val
+	}
 
-	case *data.Statistics:
+	if val := res.Statistics; val != nil {
-		nodes.Get(msg.NodeId).Statistics = msg
+		nodes.Get(val.NodeId).Statistics = val
 
-		// store data?
 		if statsDb != nil {
-			statsDb.Add(msg)
+			statsDb.Add(val)
-		}
+		}
-
-	default:
-		log.Println("unknown message:", msg)
 	}
 }

respond/collector.go

@@ -9,6 +9,8 @@ import (
 	"net"
 	"reflect"
 	"time"
+
+	"github.com/FreifunkBremen/respond-collector/data"
 )
 
 //Collector for a specificle respond messages
@@ -24,10 +26,10 @@ type Collector struct {
 	stop   chan interface{}
 }
 
-type OnReceive func(net.UDPAddr, interface{})
+type OnReceive func(net.UDPAddr, *data.ResponseData)
 
 //NewCollector creates a Collector struct
-func NewCollector(CollectType string, initialDelay time.Duration, interval time.Duration, msgStruct interface{}, onReceive OnReceive) *Collector {
+func NewCollector(CollectType string, interval time.Duration, onReceive OnReceive) *Collector {
 	// Parse address
 	addr, err := net.ResolveUDPAddr("udp", "[::]:0")
 	if err != nil {
@@ -47,7 +49,6 @@ func NewCollector(CollectType string, initialDelay time.Duration, interval time.
 		queue:       make(chan *Response, 400),
 		ticker:      time.NewTicker(interval),
 		stop:        make(chan interface{}, 1),
-		msgType:     reflect.TypeOf(msgStruct),
 		onReceive:   onReceive,
 	}
 
@@ -56,7 +57,6 @@ func NewCollector(CollectType string, initialDelay time.Duration, interval time.
 
 	// Run senders
 	go func() {
-		time.Sleep(initialDelay)
 		collector.sendOnce() // immediately
 		collector.sender()   // periodically
 	}()
@@ -111,8 +111,6 @@ func (coll *Collector) parser() {
 }
 
 func (coll *Collector) parse(response *Response) (err error) {
-	// create new struct instance
-	data := reflect.New(coll.msgType).Interface()
 
 	// deflater
 	reader := flate.NewReader(bytes.NewReader(response.Raw))
@@ -123,21 +121,13 @@ func (coll *Collector) parse(response *Response) (err error) {
 		return
 	}
 
-	// Remove useless wrapper element that only exists in compressed data.
+	res := &data.ResponseData{}
-	// Who introduced this !?
+	err = json.Unmarshal(decompressed, res)
-	if bytes.HasPrefix(decompressed, []byte(`{"neighbours":`)) ||
-		bytes.HasPrefix(decompressed, []byte(`{"statistics":`)) {
-		decompressed = decompressed[14 : len(decompressed)-1]
-	} else if bytes.HasPrefix(decompressed, []byte(`{"nodeinfo":`)) {
-		decompressed = decompressed[12 : len(decompressed)-1]
-	}
-
-	err = json.Unmarshal(decompressed, data)
 	if err != nil {
 		return
 	}
 
-	coll.onReceive(response.Address, data)
+	coll.onReceive(response.Address, res)
 
 	return
 }

respond/collector_test.go

@@ -12,16 +12,11 @@ import (
 
 func TestParse(t *testing.T) {
 	assert := assert.New(t)
-	var decompressed *data.NodeInfo
+	var decompressed *data.ResponseData
 
 	// callback function
-	onReceive := func(addr net.UDPAddr, msg interface{}) {
+	onReceive := func(addr net.UDPAddr, res *data.ResponseData) {
-		switch msg := msg.(type) {
+		decompressed = res
-		case *data.NodeInfo:
-			decompressed = msg
-		default:
-			t.Error("unexpected message:", msg)
-		}
 	}
 
 	collector := &Collector{
@@ -38,5 +33,6 @@ func TestParse(t *testing.T) {
 	})
 
 	assert.NotNil(decompressed)
-	assert.Equal("f81a67a5e9c1", decompressed.NodeId)
+	assert.NotNil(decompressed.NodeInfo)
+	assert.Equal("f81a67a5e9c1", decompressed.NodeInfo.NodeId)
 }

respond/multi_collector.go

@@ -1,29 +0,0 @@
-package respond
-
-import (
-	"github.com/FreifunkBremen/respond-collector/data"
-	"time"
-)
-
-//MultiCollector struct
-type MultiCollector struct {
-	collectors []*Collector
-}
-
-//NewMultiCollector create a list of collectors
-func NewMultiCollector(interval time.Duration, onReceive OnReceive) *MultiCollector {
-	return &MultiCollector{
-		collectors: []*Collector{
-			NewCollector("statistics", 0, interval, data.Statistics{}, onReceive),
-			NewCollector("nodeinfo", time.Second*3, interval, data.NodeInfo{}, onReceive),
-			NewCollector("neighbours", time.Second*6, interval, data.Neighbours{}, onReceive),
-		},
-	}
-}
-
-//Close all Collections
-func (multi *MultiCollector) Close() {
-	for _, col := range multi.collectors {
-		col.Close()
-	}
-}