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

fixes

This commit is contained in:
davidnewhall2 2019-12-17 02:09:30 -08:00
parent d3d420597e
commit da75406310
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gopkg.lock generated
View File

@ -107,11 +107,11 @@
[[projects]] [[projects]]
branch = "master" branch = "master"
digest = "1:7a90fad47972b5ae06013d4685eb2f3007e7c92609a1399d2adf59fe04cd9b63" digest = "1:331d56d3a24e9b8d203883c28803313af060ca5c350be0a9c0552b43f355ecd8"
name = "golift.io/config" name = "golift.io/config"
packages = ["."] packages = ["."]
pruneopts = "UT" pruneopts = "UT"
revision = "fe642c8392dc00d72ddcc47f05a06096bd5d054b" revision = "1861b4270bf42ec3ccaf86871aa1cf6742564d0f"
[[projects]] [[projects]]
digest = "1:2883cea734f2766f41ff9c9d4aefccccc53e3d44f5c8b08893b9c218cf666722" digest = "1:2883cea734f2766f41ff9c9d4aefccccc53e3d44f5c8b08893b9c218cf666722"

9
pkg/inputunifi/input.go
View File

@ -108,14 +108,21 @@ func (u *InputUnifi) checkSites(c *Controller) error {
return nil return nil
} }
keep := []string{}
FIRST: FIRST:
for _, s := range c.Sites { for _, s := range c.Sites {
for _, site := range sites { for _, site := range sites {
if s == site.Name { if s == site.Name {
keep = append(keep, s)
continue FIRST continue FIRST
} }
} }
return fmt.Errorf("configured site not found on controller: %v", s) u.LogErrorf("Configured site not found on controller %s: %v", c.Name, s)
}
if c.Sites = keep; len(keep) < 1 {
c.Sites = []string{"all"}
} }
return nil return nil

3
pkg/poller/config.go
View File

@ -52,7 +52,7 @@ type Metrics struct {
// Config represents the core library input data. // Config represents the core library input data.
type Config struct { type Config struct {
Poller `json:"poller" toml:"poller" xml:"poller" yaml:"poller"` *Poller `json:"poller" toml:"poller" xml:"poller" yaml:"poller"`
} }
// Poller is the global config values. // Poller is the global config values.
@ -103,6 +103,7 @@ func (u *UnifiPoller) ParseConfigs() error {
// parseInterface parses the config file and environment variables into the provided interface. // parseInterface parses the config file and environment variables into the provided interface.
func (u *UnifiPoller) parseInterface(i interface{}) error { func (u *UnifiPoller) parseInterface(i interface{}) error {
config.ENVTag = "xml" // xml tag is better formatted for slices.
// Parse config file into provided interface. // Parse config file into provided interface.
if err := config.ParseFile(i, u.Flags.ConfigFile); err != nil { if err := config.ParseFile(i, u.Flags.ConfigFile); err != nil {
return err return err

2
pkg/poller/start.go
View File

@ -12,7 +12,7 @@ import (
// New returns a new poller struct. // New returns a new poller struct.
func New() *UnifiPoller { func New() *UnifiPoller {
return &UnifiPoller{Config: &Config{}, Flags: &Flags{}} return &UnifiPoller{Config: &Config{Poller: &Poller{}}, Flags: &Flags{}}
} }
// Start begins the application from a CLI. // Start begins the application from a CLI.