Fix up powersupplyclass error
Switch to go `%w` error verb and errors.Is(). Signed-off-by: Ben Kochie <superq@gmail.com>
This commit is contained in:
parent
35bfe455df
commit
64ba27e7d6
|
@ -17,6 +17,7 @@
|
||||||
package collector
|
package collector
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"regexp"
|
"regexp"
|
||||||
|
@ -55,7 +56,7 @@ func NewPowerSupplyClassCollector(logger log.Logger) (Collector, error) {
|
||||||
func (c *powerSupplyClassCollector) Update(ch chan<- prometheus.Metric) error {
|
func (c *powerSupplyClassCollector) Update(ch chan<- prometheus.Metric) error {
|
||||||
powerSupplyClass, err := getPowerSupplyClassInfo(c.ignoredPattern)
|
powerSupplyClass, err := getPowerSupplyClassInfo(c.ignoredPattern)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if os.IsNotExist(err) {
|
if errors.Is(err, os.ErrNotExist) {
|
||||||
return ErrNoData
|
return ErrNoData
|
||||||
}
|
}
|
||||||
return fmt.Errorf("could not get power_supply class info: %s", err)
|
return fmt.Errorf("could not get power_supply class info: %s", err)
|
||||||
|
@ -188,7 +189,7 @@ func getPowerSupplyClassInfo(ignore *regexp.Regexp) (sysfs.PowerSupplyClass, err
|
||||||
powerSupplyClass, err := fs.PowerSupplyClass()
|
powerSupplyClass, err := fs.PowerSupplyClass()
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return powerSupplyClass, fmt.Errorf("error obtaining power_supply class info: %s", err)
|
return powerSupplyClass, fmt.Errorf("error obtaining power_supply class info: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
for device := range powerSupplyClass {
|
for device := range powerSupplyClass {
|
||||||
|
|
Loading…
Reference in New Issue