homelab/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix errors load config (#470)

Browse source 
* Trim spaces in rules

Signed-off-by: Emile Vauge <emile@vauge.com>

* dont break the whole config while only one part is wrong

Signed-off-by: Emile Vauge <emile@vauge.com>
This commit is contained in:
Emile Vauge 2016-06-20 15:19:52 +02:00 • committed by Vincent Demeester
parent 11874bc4ae
commit 93494c7e35
2 changed files with 40 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rules.go
View file

@ -123,11 +123,11 @@ func (r *Rules) Parse(expression string) (*mux.Route, error) {
// get function
parsedFunctions := strings.FieldsFunc(rule, f)
if len(parsedFunctions) == 0 {
return nil, errors.New("Error parsing rule: " + rule)
return nil, errors.New("Error parsing rule: '" + rule + "'")
}
parsedFunction, ok := functions[parsedFunctions[0]]
parsedFunction, ok := functions[strings.TrimSpace(parsedFunctions[0])]
if !ok {
return nil, errors.New("Error parsing rule: " + rule + ". Unknown function: " + parsedFunctions[0])
return nil, errors.New("Error parsing rule: '" + rule + "'. Unknown function: '" + parsedFunctions[0] + "'")
}
parsedFunctions = append(parsedFunctions[:0], parsedFunctions[1:]...)
fargs := func(c rune) bool {
@ -136,12 +136,12 @@ func (r *Rules) Parse(expression string) (*mux.Route, error) {
// get function
parsedArgs := strings.FieldsFunc(strings.Join(parsedFunctions, ":"), fargs)
if len(parsedArgs) == 0 {
return nil, errors.New("Error parsing args from rule: " + rule)
return nil, errors.New("Error parsing args from rule: '" + rule + "'")
}
inputs := make([]reflect.Value, len(parsedArgs))
for i := range parsedArgs {
inputs[i] = reflect.ValueOf(parsedArgs[i])
inputs[i] = reflect.ValueOf(strings.TrimSpace(parsedArgs[i]))
}
method := reflect.ValueOf(parsedFunction)
if method.IsValid() {
@ -154,7 +154,7 @@ func (r *Rules) Parse(expression string) (*mux.Route, error) {
}
} else {
return nil, errors.New("Method not found: " + parsedFunctions[0])
return nil, errors.New("Method not found: '" + parsedFunctions[0] + "'")
}
}
return resultRoute, nil