diff --git a/VERSION b/VERSION index 347f583..9df886c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.1 +1.4.2 diff --git a/bird/bird.go b/bird/bird.go index c2d142c..bb215c7 100644 --- a/bird/bird.go +++ b/bird/bird.go @@ -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 }