Merge pull request #425 from mdlayher/wifi-update

Update vendored wifi, handle stations with missing info
prometheus · Jan 20, 2017 · acb495c · acb495c
2 parents 2a0c80c + ca3f07f
commit acb495c
Show file tree

Hide file tree

Showing 6 changed files with 288 additions and 41 deletions.
diff --git a/collector/wifi_linux.go b/collector/wifi_linux.go
@@ -155,19 +155,23 @@ func (c *wifiCollector) Update(ch chan<- prometheus.Metric) error {
 			continue
 		}
 
-		info, err := stat.StationInfo(ifi)
-		if err != nil {
-			return fmt.Errorf("failed to retrieve station info for device %s: %v",
-				ifi.Name, err)
-		}
-
 		ch <- prometheus.MustNewConstMetric(
 			c.InterfaceFrequencyHertz,
 			prometheus.GaugeValue,
 			mHzToHz(ifi.Frequency),
 			ifi.Name,
 		)
 
+		info, err := stat.StationInfo(ifi)
+		if err != nil {
+			if os.IsNotExist(err) {
+				continue
+			}
+
+			return fmt.Errorf("failed to retrieve station info for device %s: %v",
+				ifi.Name, err)
+		}
+
 		c.updateStationStats(ch, ifi.Name, info)
 	}
 

diff --git a/vendor/github.com/mdlayher/wifi/client.go b/vendor/github.com/mdlayher/wifi/client.go
diff --git a/vendor/github.com/mdlayher/wifi/client_linux.go b/vendor/github.com/mdlayher/wifi/client_linux.go
diff --git a/vendor/github.com/mdlayher/wifi/client_others.go b/vendor/github.com/mdlayher/wifi/client_others.go