From 445ed44082ad489d1e58fb857ac12326acb0d0c2 Mon Sep 17 00:00:00 2001 From: Tobias Schmidt Date: Wed, 22 Mar 2017 10:11:19 -0300 Subject: [PATCH] mdadm: Remove extra file existence check --- collector/mdadm_linux.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/collector/mdadm_linux.go b/collector/mdadm_linux.go index 03f76fde..be78e97b 100644 --- a/collector/mdadm_linux.go +++ b/collector/mdadm_linux.go @@ -133,7 +133,7 @@ func evalBuildline(buildline string) (int64, error) { func parseMdstat(mdStatusFilePath string) ([]mdStatus, error) { content, err := ioutil.ReadFile(mdStatusFilePath) if err != nil { - return []mdStatus{}, fmt.Errorf("error parsing mdstat: %s", err) + return []mdStatus{}, err } lines := strings.Split(string(content), "\n") @@ -257,16 +257,12 @@ var ( func (c *mdadmCollector) Update(ch chan<- prometheus.Metric) error { statusfile := procFilePath("mdstat") - if _, err := os.Stat(statusfile); err != nil { + mdstate, err := parseMdstat(statusfile) + if err != nil { if os.IsNotExist(err) { log.Debugf("Not collecting mdstat, file does not exist: %s", statusfile) return nil } - return err - } - - mdstate, err := parseMdstat(statusfile) - if err != nil { return fmt.Errorf("error parsing mdstatus: %s", err) }