ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-02-22 02:16:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change ipAddress to IPAddresses and add error message on unknown ip addr type

Browse Source
This commit is contained in:
Praneeth Bodduluri 2015-09-18 22:29:25 +05:30 committed by Pablo Carranza Vélez
parent bc0afb0032
commit 391a141843
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gosuper/gosuper/api.go
View File

@ -143,6 +143,7 @@ func ipAddress() (ipAddresses []string, err error) {
case *net.IPAddr: case *net.IPAddr:
ip = v.IP ip = v.IP
default: default:
log.Printf("Warning: Unrecognised type %T\n", v)
continue continue
} }
if ip == nil { if ip == nil {
@ -151,7 +152,7 @@ func ipAddress() (ipAddresses []string, err error) {
if ip = ip.To4(); ip == nil { if ip = ip.To4(); ip == nil {
continue // This isnt an IPv4 Addresss continue // This isnt an IPv4 Addresss
} }
ipAddresses = append(ipAddresses, ip.String()) ipAddresses = append(IPAddresses, ip.String())
} }
} }
return return
@ -168,7 +169,7 @@ func IPAddressHandler(writer http.ResponseWriter, request *http.Request) {
sendError("Invalid request") sendError("Invalid request")
} else { } else {
payload := make(map[string][]string) payload := make(map[string][]string)
payload["IPAddress"] = ipAddr payload["IPAddresses"] = ipAddr
sendResponse(payload, "", http.StatusOK) sendResponse(payload, "", http.StatusOK)
} }
} }

2
src/app.coffee
View File

@ -58,7 +58,7 @@ knex.init.then ->
callback = (error, response, body ) -> callback = (error, response, body ) ->
if !error && response.statusCode == 200 if !error && response.statusCode == 200
device.updateState( device.updateState(
ip_address: body.Data.IPAddress.join(' ') ip_address: body.Data.IPAddresses.join(' ')
) )
request.get({ url: "#{config.gosuperAddress}/v1/ipaddr", json: true }, callback ) request.get({ url: "#{config.gosuperAddress}/v1/ipaddr", json: true }, callback )