homelab/traefik
1
0
Fork 0
Code Activity

Change the loading resource order

Browse source
This commit is contained in:
Ludovic Fernandez 2019-06-24 16:40:06 +02:00 • committed by Traefiker Bot
parent dd62051e6c
commit 4d44ab9628
4 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkg/cli/loader_env.go
View file

@ -3,6 +3,7 @@ package cli
import (
"fmt"
"os"
"strings"
"github.com/containous/traefik/pkg/config/env"
"github.com/containous/traefik/pkg/log"
@ -19,7 +20,8 @@ func (e *EnvLoader) Load(_ []string, cmd *Command) (bool, error) {
}
if err := env.Decode(vars, env.DefaultNamePrefix, cmd.Configuration); err != nil {
return false, fmt.Errorf("failed to decode configuration from environment variables: %v", err)
log.WithoutContext().Debug("environment variables", strings.Join(vars, ", "))
return false, fmt.Errorf("failed to decode configuration from environment variables: %v ", err)
}
log.WithoutContext().Println("Configuration loaded from environment variables.")

4
pkg/cli/loader_flag.go
View file

@ -12,6 +12,10 @@ type FlagLoader struct{}
// Load loads the command's configuration from flag arguments.
func (*FlagLoader) Load(args []string, cmd *Command) (bool, error) {
if len(args) == 0 {
return false, nil
}
if err := flag.Decode(args, cmd.Configuration); err != nil {
return false, fmt.Errorf("failed to decode configuration from flags: %v", err)
}