Mirrors/birdwatcher
1
0
Fork 0
mirror of https://github.com/alice-lg/birdwatcher.git synced 2025-03-09 00:00:05 +01:00
Code Issues Releases Wiki Activity

use nested map

Browse source
This commit is contained in:
Matthias Hannig 2016-12-05 14:33:21 +01:00
parent 2dfcf48ac7
commit 9583f996cf
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
1.4.1
1.4.2

9
bird/bird.go
View file

@ -54,12 +54,13 @@ func RunAndParse(cmd string, parser func([]byte) Parsed) (Parsed, bool) {
func Status() (Parsed, bool) {
birdStatus, ok := RunAndParse("status", parseStatus)
status := birdStatus["status"].(map[string]interface{})
// Last Reconfig Timestamp source:
var lastReconfig string
switch StatusConf.ReconfigTimestampSource {
case "bird":
lastReconfig = birdStatus["last_reconfig"].(string)
lastReconfig = status["last_reconfig"].(string)
break
case "config_modified":
lastReconfig = lastReconfigTimestampFromFileStat(
@ -72,13 +73,15 @@ func Status() (Parsed, bool) {
)
}
birdStatus["last_reconfig"] = lastReconfig
status["last_reconfig"] = lastReconfig
// Filter fields
for _, field := range StatusConf.FilterFields {
birdStatus[field] = nil
status[field] = nil
}
birdStatus["status"] = status
return birdStatus, ok
}