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

Fix tests

This commit is contained in:
David Newhall II 2019-08-25 13:35:59 -07:00
parent fe040cb97e
commit fe5af9d0fa
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/poller/.metadata.sh
View File

@ -11,7 +11,7 @@ HBREPO="golift/homebrew-mugs"
MAINT="David Newhall II <david at sleepers dot pro>" MAINT="David Newhall II <david at sleepers dot pro>"
VENDOR="Go Lift" VENDOR="Go Lift"
DESC="Polls a UniFi controller and stores metrics in InfluxDB" DESC="Polls a UniFi controller and stores metrics in InfluxDB"
GOLANGCI_LINT_ARGS="--enable-all -D gochecknoglobals" GOLANGCI_LINT_ARGS="--enable-all -D gochecknoglobals -e dupl"
# Example must exist at examples/$CONFIG_FILE.example # Example must exist at examples/$CONFIG_FILE.example
CONFIG_FILE="up.conf" CONFIG_FILE="up.conf"
LICENSE="MIT" LICENSE="MIT"

9
core/poller/unifipoller/unifi.go
View File

@ -167,7 +167,8 @@ func (u *UnifiPoller) ReportMetrics(metrics *Metrics) error {
// we just log the errors and tally them on a counter. In reality, this never // we just log the errors and tally them on a counter. In reality, this never
// returns any errors because we control the data going in; cool right? But we // returns any errors because we control the data going in; cool right? But we
// still check&log it in case the data going is skewed up and causes errors! // still check&log it in case the data going is skewed up and causes errors!
func (m *Metrics) ProcessPoints() (errs []error) { func (m *Metrics) ProcessPoints() []error {
errs := []error{}
processPoints := func(m *Metrics, p []*influx.Point, err error) error { processPoints := func(m *Metrics, p []*influx.Point, err error) error {
if err != nil || p == nil { if err != nil || p == nil {
return err return err
@ -175,6 +176,7 @@ func (m *Metrics) ProcessPoints() (errs []error) {
m.BatchPoints.AddPoints(p) m.BatchPoints.AddPoints(p)
return nil return nil
} }
for _, asset := range m.Sites { for _, asset := range m.Sites {
pts, err := SitePoints(asset, m.TS) pts, err := SitePoints(asset, m.TS)
errs = append(errs, processPoints(m, pts, err)) errs = append(errs, processPoints(m, pts, err))
@ -187,8 +189,9 @@ func (m *Metrics) ProcessPoints() (errs []error) {
pts, err := IDSPoints(asset) // no m.TS. pts, err := IDSPoints(asset) // no m.TS.
errs = append(errs, processPoints(m, pts, err)) errs = append(errs, processPoints(m, pts, err))
} }
if m.Devices == nil { if m.Devices == nil {
return return errs
} }
for _, asset := range m.UAPs { for _, asset := range m.UAPs {
pts, err := UAPPoints(asset, m.TS) pts, err := UAPPoints(asset, m.TS)
@ -202,7 +205,7 @@ func (m *Metrics) ProcessPoints() (errs []error) {
pts, err := USWPoints(asset, m.TS) pts, err := USWPoints(asset, m.TS)
errs = append(errs, processPoints(m, pts, err)) errs = append(errs, processPoints(m, pts, err))
} }
return return errs
} }
// GetFilteredSites returns a list of sites to fetch data for. // GetFilteredSites returns a list of sites to fetch data for.