From d82b2296b9f1c27b4e285a37076d41c4223eb6fa Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sat, 14 Dec 2019 19:42:03 -0800 Subject: [PATCH] remove naked return --- integrations/promunifi/pkg/poller/unifi.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/integrations/promunifi/pkg/poller/unifi.go b/integrations/promunifi/pkg/poller/unifi.go index 03435a2b..5ba11127 100644 --- a/integrations/promunifi/pkg/poller/unifi.go +++ b/integrations/promunifi/pkg/poller/unifi.go @@ -79,8 +79,9 @@ FIRST: } // CollectMetrics grabs all the measurements from a UniFi controller and returns them. -func (u *UnifiPoller) CollectMetrics() (metrics *metrics.Metrics, err error) { - var errs []string +func (u *UnifiPoller) CollectMetrics() (*metrics.Metrics, error) { + errs := []string{} + metrics := &metrics.Metrics{} for _, c := range u.Config.Controllers { m, err := u.collectController(c) @@ -119,11 +120,13 @@ func (u *UnifiPoller) CollectMetrics() (metrics *metrics.Metrics, err error) { metrics.UDMs = append(metrics.UDMs, m.UDMs...) } + var err error + if len(errs) > 0 { err = fmt.Errorf(strings.Join(errs, ", ")) } - return + return metrics, err } func (u *UnifiPoller) collectController(c Controller) (*metrics.Metrics, error) {