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

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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/traefik/traefik.go
View file

@ -44,7 +44,7 @@ func main() {
// traefik config inits // traefik config inits
tConfig := cmd.NewTraefikConfiguration() tConfig := cmd.NewTraefikConfiguration()
loaders := []cli.ResourceLoader{&cli.FileLoader{}, &cli.EnvLoader{}, &cli.FlagLoader{}} loaders := []cli.ResourceLoader{&cli.FileLoader{}, &cli.FlagLoader{}, &cli.EnvLoader{}}
cmdTraefik := &cli.Command{ cmdTraefik := &cli.Command{
Name: "traefik", Name: "traefik",

2
docs/content/getting-started/configuration-overview.md
View file

@ -36,8 +36,8 @@ Traefik gets its _dynamic configuration_ from [providers](../providers/overview.
There are three different, mutually exclusive, ways to define static configuration options in Traefik: There are three different, mutually exclusive, ways to define static configuration options in Traefik:
- In a configuration file - In a configuration file
- As environment variables
- In the command-line arguments - In the command-line arguments
- As environment variables
These ways are evaluated in the order listed above. These ways are evaluated in the order listed above.

4
pkg/cli/loader_env.go
View file

@ -3,6 +3,7 @@ package cli
import ( import (
"fmt" "fmt"
"os" "os"
"strings"
"github.com/containous/traefik/pkg/config/env" "github.com/containous/traefik/pkg/config/env"
"github.com/containous/traefik/pkg/log" "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 { 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.") 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. // Load loads the command's configuration from flag arguments.
func (*FlagLoader) Load(args []string, cmd *Command) (bool, error) { 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 { if err := flag.Decode(args, cmd.Configuration); err != nil {
return false, fmt.Errorf("failed to decode configuration from flags: %v", err) return false, fmt.Errorf("failed to decode configuration from flags: %v", err)
} }