public_git
/
unpoller_unpoller
mirror of https://github.com/unpoller/unpoller.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix lint

This commit is contained in:
davidnewhall2 2019-12-30 02:02:52 -08:00
parent b975a89acc
commit d94f2d6ea7
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
integrations/inputunifi/collector.go
View File

@ -90,8 +90,10 @@ func (u *InputUnifi) pollController(c *Controller) (*poller.Metrics, error) {
} }
} }
idsTime := 2 * time.Minute
if c.SaveIDS { 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 { if err != nil {
return m, fmt.Errorf("unifi.GetIDS(%v): %v", c.URL, err) 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() sites, err := c.Unifi.GetSites()
if err != nil { if err != nil {
return nil, err 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 return sites, nil
} }

6
integrations/inputunifi/input.go
View File

@ -98,7 +98,7 @@ func (u *InputUnifi) checkSites(c *Controller) error {
u.RLock() u.RLock()
defer u.RUnlock() defer u.RUnlock()
if len(c.Sites) < 1 || c.Sites[0] == "" { if len(c.Sites) == 0 || c.Sites[0] == "" {
c.Sites = []string{"all"} c.Sites = []string{"all"}
} }
@ -134,7 +134,7 @@ FIRST:
u.LogErrorf("Configured site not found on controller %s: %v", c.Role, s) 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"} c.Sites = []string{"all"}
} }
@ -181,7 +181,7 @@ func (u *InputUnifi) setDefaults(c *Controller) {
c.User = defaultUser c.User = defaultUser
} }
if len(c.Sites) < 1 { if len(c.Sites) == 0 {
c.Sites = []string{defaultSite} c.Sites = []string{defaultSite}
} }
} }

4
integrations/inputunifi/interface.go
View File

@ -23,12 +23,12 @@ func (u *InputUnifi) Initialize(l poller.Logger) error {
return nil 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. new := u.Default // copy defaults.
u.Controllers = []*Controller{&new} u.Controllers = []*Controller{&new}
} }
if len(u.Controllers) < 1 { if len(u.Controllers) == 0 {
l.Logf("No controllers configured. Polling dynamic controllers only!") l.Logf("No controllers configured. Polling dynamic controllers only!")
} }