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

add Flags and MeshviewerStatistics for old meshviewer nodes.json

Browse Source
This commit is contained in:
Martin Geno 2016-05-11 21:37:42 +02:00
parent 54e54f8256
commit 8099228798
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
models/nodes.go
View File

@ -17,8 +17,7 @@ type Node struct {
Firstseen jsontime.Time `json:"firstseen"` Firstseen jsontime.Time `json:"firstseen"`
Lastseen jsontime.Time `json:"lastseen"` Lastseen jsontime.Time `json:"lastseen"`
Flags *Flags `json:"flags,omitempty"` Flags *Flags `json:"flags,omitempty"`
//Statistics *MeshviewerStatistics `json:"statistics"` Statistics *MeshviewerStatistics `json:"statistics"`
Statistics *data.Statistics `json:"statistics"`
Nodeinfo *data.NodeInfo `json:"nodeinfo"` Nodeinfo *data.NodeInfo `json:"nodeinfo"`
Neighbours *data.Neighbours `json:"-"` Neighbours *data.Neighbours `json:"-"`
} }
@ -87,10 +86,9 @@ func (nodes *Nodes) Update(nodeID string, res *data.ResponseData) {
// Update statistics // Update statistics
if val := res.Statistics; val != nil { if val := res.Statistics; val != nil {
//node.Statistics = &MeshviewerStatistics{ node.Statistics = &MeshviewerStatistics{
node.Statistics = &data.Statistics{
NodeId: val.NodeId, NodeId: val.NodeId,
// Clients: 0, Clients: 0,
Gateway: val.Gateway, Gateway: val.Gateway,
RootFsUsage: val.RootFsUsage, RootFsUsage: val.RootFsUsage,
LoadAverage: val.LoadAverage, LoadAverage: val.LoadAverage,
@ -101,8 +99,7 @@ func (nodes *Nodes) Update(nodeID string, res *data.ResponseData) {
MeshVpn: val.MeshVpn, MeshVpn: val.MeshVpn,
Traffic: val.Traffic, Traffic: val.Traffic,
} }
//node.Statistics.Clients = val.Clients.Total node.Statistics.Clients = val.Clients.Total
node.Statistics.Clients = val.Clients
} }
} }
@ -114,16 +111,13 @@ func (nodes *Nodes) worker() {
log.Println("saving", len(nodes.List), "nodes") log.Println("saving", len(nodes.List), "nodes")
nodes.Timestamp = jsontime.Now() nodes.Timestamp = jsontime.Now()
nodes.Lock() nodes.Lock()
//
// set node as offline (without statistics) // set node as offline (without statistics)
for _,node := range nodes.List { for _,node := range nodes.List {
if node.Statistics != nil && node.Lastseen.Unix()+int64(5*nodes.config.Respondd.CollectInterval) < nodes.Timestamp.Unix() { if node.Statistics != nil && node.Lastseen.Unix()+int64(5*nodes.config.Respondd.CollectInterval) < nodes.Timestamp.Unix() {
// node.Statistics.Clients = data.Clients{Wifi: 0, Wifi24: 0, Wifi5: 0, Total: 0} node.Statistics = &MeshviewerStatistics{
// node.Statistics = &MeshviewerStatistics{
node.Statistics = &data.Statistics{
NodeId: node.Statistics.NodeId, NodeId: node.Statistics.NodeId,
//Clients: 0, Clients: 0,
Clients: data.Clients{Wifi: 0, Wifi24: 0, Wifi5: 0, Total: 0},
} }
if node.Flags != nil { if node.Flags != nil {
node.Flags.Online = false node.Flags.Online = false