Freifunk-Troisdorf/yanic
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use compressed respond data

Browse Source
This commit is contained in:
Julian Kornberger 2016-03-19 01:50:23 +01:00
parent 30b04d9043
commit 8d471d532a
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
respond/collector.go
View File

@ -1,6 +1,8 @@
package respond
import (
"bytes"
"compress/flate"
"encoding/json"
"log"
"net"
@ -82,7 +84,7 @@ func (coll *Collector) sendPacket(address string) {
log.Panic(err)
}
if _, err := coll.connection.WriteToUDP([]byte(coll.CollectType), addr); err != nil {
if _, err := coll.connection.WriteToUDP([]byte("GET "+coll.CollectType), addr); err != nil {
log.Println("WriteToUDP failed:", err)
}
}
@ -101,17 +103,28 @@ func (coll *Collector) sender() {
func (coll *Collector) parser() {
for obj := range coll.queue {
// create new struct instance
data := reflect.New(coll.msgType).Interface()
if err := json.Unmarshal(obj.Raw, data); err == nil {
coll.onReceive(obj.Address, data)
} else {
if err := coll.parse(obj); err != nil {
log.Println("unable to decode response from", obj.Address.String(), err, "\n", string(obj.Raw))
}
}
}
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))
defer reader.Close()
decoder := json.NewDecoder(reader)
if err = decoder.Decode(data); err == nil {
coll.onReceive(response.Address, data)
}
return
}
func (coll *Collector) receiver() {
buf := make([]byte, maxDataGramSize)
for {