prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #453 from rjnagal/docker

Browse Source 
Add error checks for netlink read.
This commit is contained in:
Victor Marmol 2015-01-20 07:56:56 -08:00
commit 9f6c331165
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
utils/cpuload/conn.go
View File

@ -85,7 +85,10 @@ func (self *Connection) WriteMessage(msg syscall.NetlinkMessage) error {
}
func (self *Connection) ReadMessage() (msg syscall.NetlinkMessage, err error) {
binary.Read(self.rbuf, binary.LittleEndian, &msg.Header)
err = binary.Read(self.rbuf, binary.LittleEndian, &msg.Header)
if err != nil {
return msg, err
}
msg.Data = make([]byte, msg.Header.Len-syscall.NLMSG_HDRLEN)
_, err = self.rbuf.Read(msg.Data)
return msg, err

5
utils/cpuload/netlink.go
View File

@ -76,7 +76,10 @@ func getFamilyId(conn *Connection) (uint16, error) {
msg := prepareFamilyMessage()
conn.WriteMessage(msg.toRawMsg())
resp, _ := conn.ReadMessage()
resp, err := conn.ReadMessage()
if err != nil {
return 0, err
}
id, err := parseFamilyResp(resp)
if err != nil {
return 0, err