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

pass collector errors up

This commit is contained in:
davidnewhall2 2019-12-10 00:18:51 -08:00
parent 2bb38b900e
commit 1f2cafad8d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/poller/prometheus.go
View File

@ -35,7 +35,7 @@ func (u *UnifiPoller) ExportMetrics() (*metrics.Metrics, error) {
u.LogErrorf("collecting metrics: %v", err) u.LogErrorf("collecting metrics: %v", err)
u.Logf("Re-authenticating to UniFi Controller") u.Logf("Re-authenticating to UniFi Controller")
if err := u.Unifi.Login(); err != nil { if err := u.GetUnifi(); err != nil {
u.LogErrorf("re-authenticating: %v", err) u.LogErrorf("re-authenticating: %v", err)
return nil, err return nil, err
} }

10
pkg/poller/unifi.go
View File

@ -76,20 +76,20 @@ func (u *UnifiPoller) CollectMetrics() (*metrics.Metrics, error) {
var err error var err error
// Get the sites we care about. // Get the sites we care about.
if m.Sites, err = u.GetFilteredSites(); err != nil { if m.Sites, err = u.GetFilteredSites(); err != nil {
u.LogErrorf("unifi.GetSites(): %v", err) return m, fmt.Errorf("unifi.GetSites(): %v", err)
} }
if u.Config.SaveIDS { if u.Config.SaveIDS {
m.IDSList, err = u.Unifi.GetIDS(m.Sites, time.Now().Add(u.Config.Interval.Duration), time.Now()) m.IDSList, err = u.Unifi.GetIDS(m.Sites, time.Now().Add(u.Config.Interval.Duration), time.Now())
u.LogErrorf("unifi.GetIDS(): %v", err) return m, fmt.Errorf("unifi.GetIDS(): %v", err)
} }
// Get all the points. // Get all the points.
if m.Clients, err = u.Unifi.GetClients(m.Sites); err != nil { if m.Clients, err = u.Unifi.GetClients(m.Sites); err != nil {
u.LogErrorf("unifi.GetClients(): %v", err) return m, fmt.Errorf("unifi.GetClients(): %v", err)
} }
if m.Devices, err = u.Unifi.GetDevices(m.Sites); err != nil { if m.Devices, err = u.Unifi.GetDevices(m.Sites); err != nil {
u.LogErrorf("unifi.GetDevices(): %v", err) return m, fmt.Errorf("unifi.GetDevices(): %v", err)
} }
return m, err return m, nil
} }
// AugmentMetrics is our middleware layer between collecting metrics and writing them. // AugmentMetrics is our middleware layer between collecting metrics and writing them.