Merge pull request #398 from prometheus/fish-netdev-check-scan-errror

discordianfish · web-flow · commit d17b1b44a6f4 · 2017-01-03T16:00:08.000+01:00
Check for errors in netdev scanner
diff --git a/collector/netdev_linux.go b/collector/netdev_linux.go
@@ -70,5 +70,5 @@ func parseNetDevStats(r io.Reader, ignore *regexp.Regexp) (map[string]map[string
 			netDev[dev]["transmit_"+v] = parts[i+1+len(header)]
 		}
 	}
-	return netDev, nil
+	return netDev, scanner.Err()
 }

Original file line number	Diff line number	Diff line change
`@@ -70,5 +70,5 @@ func parseNetDevStats(r io.Reader, ignore *regexp.Regexp) (map[string]map[string`
`70`	`70`	`netDev[dev]["transmit_"+v] = parts[i+1+len(header)]`
`71`	`71`	`}`
`72`	`72`	`}`
`73`		`- return netDev, nil`
	`73`	`+ return netDev, scanner.Err()`
`74`	`74`	`}`