mirror/alice-lg-alice-lg
1
0
Fork 0
mirror of https://github.com/alice-lg/alice-lg.git synced 2024-05-11 05:55:03 +00:00
Code Releases Activity

fixed issue in status parsing

Browse Source
This commit is contained in:
Matthias Hannig
2017-05-23 15:40:06 +02:00
parent 68bc1a3d9f
commit d22ee9356d
2 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
backend/sources/birdwatcher/parsers.go
View File

@ -53,6 +53,43 @@ func parseApiStatus(bird ClientResponse, config Config) (api.ApiStatus, error) {
return status, nil
}
// Parse birdwatcher status
func parseBirdwatcherStatus(bird ClientResponse, config Config) (api.Status, error) {
birdStatus := bird["status"].(map[string]interface{})
// Get special fields
serverTime, _ := parseServerTime(
birdStatus["current_server"],
SERVER_TIME_SHORT,
config.Timezone,
)
lastReboot, _ := parseServerTime(
birdStatus["last_reboot"],
SERVER_TIME_SHORT,
config.Timezone,
)
lastReconfig, _ := parseServerTime(
birdStatus["last_reconfig"],
SERVER_TIME_EXT,
config.Timezone,
)
// Make status response
status := api.Status{
ServerTime: serverTime,
LastReboot: lastReboot,
LastReconfig: lastReconfig,
Backend: "bird",
Version: mustString(birdStatus["version"], "unknown"),
Message: mustString(birdStatus["message"], "unknown"),
RouterId: mustString(birdStatus["router_id"], "unknown"),
}
return status, nil
}
// Parse neighbour uptime
func parseRelativeServerTime(uptime interface{}, config Config) time.Duration {
serverTime, _ := parseServerTime(uptime, SERVER_TIME_SHORT, config.Timezone)

35
backend/sources/birdwatcher/source.go
View File

@ -31,41 +31,14 @@ func (self *Birdwatcher) Status() (api.StatusResponse, error) {
return api.StatusResponse{}, err
}
birdStatus := bird["status"].(map[string]interface{})
// Get special fields
serverTime, _ := parseServerTime(
birdStatus["current_server"],
SERVER_TIME_SHORT,
self.config.Timezone,
)
lastReboot, _ := parseServerTime(
birdStatus["last_reboot"],
SERVER_TIME_SHORT,
self.config.Timezone,
)
lastReconfig, _ := parseServerTime(
birdStatus["last_reconfig"],
SERVER_TIME_EXT,
self.config.Timezone,
)
// Make status response
status := api.Status{
ServerTime: serverTime,
LastReboot: lastReboot,
LastReconfig: lastReconfig,
Backend: "bird",
Version: birdStatus["version"].(string),
Message: birdStatus["message"].(string),
RouterId: birdStatus["router_id"].(string),
birdStatus, err := parseBirdwatcherStatus(bird, self.config)
if err != nil {
return api.StatusResponse{}, err
}
response := api.StatusResponse{
Api: apiStatus,
Status: status,
Status: birdStatus,
}
return response, nil