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

fix Duration types

This commit is contained in:
David Newhall II 2019-08-26 00:13:03 -07:00
parent 685b9b148e
commit 779dff04bc
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
integrations/promunifi/unifipoller/start.go
View File

@ -35,7 +35,7 @@ func Start() error {
return err return err
} }
// Update Config with ENV variable overrides. // Update Config with ENV variable overrides.
if err := up.setEnvVarOptions(); err != nil { if err := up.ENVSetConfig(); err != nil {
return err return err
} }
return up.Run() return up.Run()
@ -49,16 +49,16 @@ func (f *Flag) Parse(args []string) {
f.PrintDefaults() f.PrintDefaults()
} }
f.StringVarP(&f.DumpJSON, "dumpjson", "j", "", f.StringVarP(&f.DumpJSON, "dumpjson", "j", "",
"This debug option prints a json payload and exits. See man page for more.") "This debug option prints a json payload and exits. See man page for more info.")
f.StringVarP(&f.ConfigFile, "config", "c", DefaultConfFile, "Poller Config File (TOML Format)") f.StringVarP(&f.ConfigFile, "config", "c", DefaultConfFile, "Poller config file path.")
f.BoolVarP(&f.ShowVer, "version", "v", false, "Print the version and exit") f.BoolVarP(&f.ShowVer, "version", "v", false, "Print the version and exit.")
_ = f.FlagSet.Parse(args) _ = f.FlagSet.Parse(args)
} }
// setEnvVarOptions copies environment variables into configuration values. // ENVSetConfig copies environment variables into configuration values.
// This is useful for Docker users that find it easier to pass ENV variables // This is useful for Docker users that find it easier to pass ENV variables
// than a specific configuration file. Uses reflection to find struct tags. // than a specific configuration file. Uses reflection to find struct tags.
func (u *UnifiPoller) setEnvVarOptions() error { func (u *UnifiPoller) ENVSetConfig() error {
t := reflect.TypeOf(Config{}) t := reflect.TypeOf(Config{})
// Loop each Config struct member; get reflect tag & env var value; update config. // Loop each Config struct member; get reflect tag & env var value; update config.
for i := 0; i < t.NumField(); i++ { for i := 0; i < t.NumField(); i++ {
@ -68,6 +68,7 @@ func (u *UnifiPoller) setEnvVarOptions() error {
if tag == "" || env == "" { if tag == "" || env == "" {
continue continue
} }
// Reflect and update the u.Config struct member at position i. // Reflect and update the u.Config struct member at position i.
switch c := reflect.ValueOf(u.Config).Elem().Field(i); c.Type().String() { switch c := reflect.ValueOf(u.Config).Elem().Field(i); c.Type().String() {
// Handle each member type appropriately (differently). // Handle each member type appropriately (differently).
@ -77,21 +78,21 @@ func (u *UnifiPoller) setEnvVarOptions() error {
case "int": case "int":
val, err := strconv.Atoi(env) val, err := strconv.Atoi(env)
if err != nil { if err != nil {
return err return fmt.Errorf("%s: %v", tag, err)
} }
c.Set(reflect.ValueOf(val)) c.Set(reflect.ValueOf(val))
case "[]string": case "[]string":
c.Set(reflect.ValueOf(strings.Split(env, ","))) c.Set(reflect.ValueOf(strings.Split(env, ",")))
case "Duration": case "unifipoller.Duration":
val, err := time.ParseDuration(env) val, err := time.ParseDuration(env)
if err != nil { if err != nil {
return err return fmt.Errorf("%s: %v", tag, err)
} }
c.Set(reflect.ValueOf(Duration{val})) c.Set(reflect.ValueOf(Duration{val}))
case "bool": case "bool":
val, err := strconv.ParseBool(env) val, err := strconv.ParseBool(env)
if err != nil { if err != nil {
return err return fmt.Errorf("%s: %v", tag, err)
} }
c.SetBool(val) c.SetBool(val)
} }