luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Add missing param and error in the missing case so default will work as expected

This commit is contained in:
Chris Bednarski 2015-11-16 19:55:08 -08:00
parent bd4c6b371d
commit e9bc0905d1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/config/config.go
View File

@ -80,7 +80,7 @@ func (c *Config) ReadDefault(id string, defaultValue string) string {
func (c *Config) ReadBool(id string) (bool, error) { func (c *Config) ReadBool(id string) (bool, error) {
val, ok := c.Options[id] val, ok := c.Options[id]
if !ok { if !ok {
return false, nil return false, fmt.Errorf("Specified config is missing from options")
} }
bval, err := strconv.ParseBool(val) bval, err := strconv.ParseBool(val)
if err != nil { if err != nil {
@ -92,7 +92,7 @@ func (c *Config) ReadBool(id string) (bool, error) {
// ReadBoolDefault tries to parse the specified option as a boolean. If there is // ReadBoolDefault tries to parse the specified option as a boolean. If there is
// an error in parsing, the default option is returned. // an error in parsing, the default option is returned.
func (c *Config) ReadBoolDefault(id string, defaultValue bool) bool { func (c *Config) ReadBoolDefault(id string, defaultValue bool) bool {
val, err := c.ReadBool() val, err := c.ReadBool(id)
if err != nil { if err != nil {
return defaultValue return defaultValue
} }