From d94f2d6ea7785eb0ff8e4d0f89af4eb85d75f900 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Mon, 30 Dec 2019 02:02:52 -0800 Subject: [PATCH] fix lint --- integrations/inputunifi/collector.go | 6 ++++-- integrations/inputunifi/input.go | 6 +++--- integrations/inputunifi/interface.go | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/integrations/inputunifi/collector.go b/integrations/inputunifi/collector.go index 1a2b6845..9fac5dc0 100644 --- a/integrations/inputunifi/collector.go +++ b/integrations/inputunifi/collector.go @@ -90,8 +90,10 @@ func (u *InputUnifi) pollController(c *Controller) (*poller.Metrics, error) { } } + idsTime := 2 * time.Minute + if c.SaveIDS { - m.IDSList, err = c.Unifi.GetIDS(m.Sites, time.Now().Add(2*time.Minute), time.Now()) + m.IDSList, err = c.Unifi.GetIDS(m.Sites, time.Now().Add(idsTime), time.Now()) if err != nil { return m, fmt.Errorf("unifi.GetIDS(%v): %v", c.URL, err) } @@ -177,7 +179,7 @@ func (u *InputUnifi) getFilteredSites(c *Controller) (unifi.Sites, error) { sites, err := c.Unifi.GetSites() if err != nil { return nil, err - } else if len(c.Sites) < 1 || StringInSlice("all", c.Sites) { + } else if len(c.Sites) == 0 || StringInSlice("all", c.Sites) { return sites, nil } diff --git a/integrations/inputunifi/input.go b/integrations/inputunifi/input.go index b28fd35b..0d52083a 100644 --- a/integrations/inputunifi/input.go +++ b/integrations/inputunifi/input.go @@ -98,7 +98,7 @@ func (u *InputUnifi) checkSites(c *Controller) error { u.RLock() defer u.RUnlock() - if len(c.Sites) < 1 || c.Sites[0] == "" { + if len(c.Sites) == 0 || c.Sites[0] == "" { c.Sites = []string{"all"} } @@ -134,7 +134,7 @@ FIRST: u.LogErrorf("Configured site not found on controller %s: %v", c.Role, s) } - if c.Sites = keep; len(keep) < 1 { + if c.Sites = keep; len(keep) == 0 { c.Sites = []string{"all"} } @@ -181,7 +181,7 @@ func (u *InputUnifi) setDefaults(c *Controller) { c.User = defaultUser } - if len(c.Sites) < 1 { + if len(c.Sites) == 0 { c.Sites = []string{defaultSite} } } diff --git a/integrations/inputunifi/interface.go b/integrations/inputunifi/interface.go index 556b5803..1f95f2b3 100644 --- a/integrations/inputunifi/interface.go +++ b/integrations/inputunifi/interface.go @@ -23,12 +23,12 @@ func (u *InputUnifi) Initialize(l poller.Logger) error { return nil } - if u.setDefaults(&u.Default); len(u.Controllers) < 1 && !u.Dynamic { + if u.setDefaults(&u.Default); len(u.Controllers) == 0 && !u.Dynamic { new := u.Default // copy defaults. u.Controllers = []*Controller{&new} } - if len(u.Controllers) < 1 { + if len(u.Controllers) == 0 { l.Logf("No controllers configured. Polling dynamic controllers only!") }