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

New logger for the Traefik logs

Browse source
This commit is contained in:
Ludovic Fernandez 2022-11-21 18:36:05 +01:00 • committed by GitHub
parent 27c02b5a56
commit 56f7515ecd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
297 changed files with 2337 additions and 1934 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pkg/cli/loader_env.go
View file

@ -5,9 +5,9 @@ import (
"os"
"strings"
"github.com/rs/zerolog/log"
"github.com/traefik/paerser/cli"
"github.com/traefik/paerser/env"
"github.com/traefik/traefik/v2/pkg/log"
)
// EnvLoader loads a configuration from all the environment variables prefixed with "TRAEFIK_".
@ -21,11 +21,11 @@ func (e *EnvLoader) Load(_ []string, cmd *cli.Command) (bool, error) {
}
if err := env.Decode(vars, env.DefaultNamePrefix, cmd.Configuration); err != nil {
log.WithoutContext().Debug("environment variables", strings.Join(vars, ", "))
return false, fmt.Errorf("failed to decode configuration from environment variables: %w ", err)
log.Debug().Msgf("environment variables: %s", strings.Join(vars, ", "))
return false, fmt.Errorf("failed to decode configuration from environment variables: %w", err)
}
log.WithoutContext().Println("Configuration loaded from environment variables.")
log.Print("Configuration loaded from environment variables")
return true, nil
}

7
pkg/cli/loader_file.go
View file

@ -4,10 +4,10 @@ import (
"os"
"strings"
"github.com/rs/zerolog/log"
"github.com/traefik/paerser/cli"
"github.com/traefik/paerser/file"
"github.com/traefik/paerser/flag"
"github.com/traefik/traefik/v2/pkg/log"
)
// FileLoader loads a configuration from a file.
@ -52,11 +52,10 @@ func (f *FileLoader) Load(args []string, cmd *cli.Command) (bool, error) {
return false, nil
}
logger := log.WithoutContext()
logger.Printf("Configuration loaded from file: %s", configFile)
log.Printf("Configuration loaded from file: %s", configFile)
content, _ := os.ReadFile(configFile)
logger.Debug(string(content))
log.Debug().Str("configFile", configFile).Bytes("content", content).Send()
return true, nil
}

4
pkg/cli/loader_flag.go
View file

@ -3,9 +3,9 @@ package cli
import (
"fmt"
"github.com/rs/zerolog/log"
"github.com/traefik/paerser/cli"
"github.com/traefik/paerser/flag"
"github.com/traefik/traefik/v2/pkg/log"
)
// FlagLoader loads configuration from flags.
@ -21,7 +21,7 @@ func (*FlagLoader) Load(args []string, cmd *cli.Command) (bool, error) {
return false, fmt.Errorf("failed to decode configuration from flags: %w", err)
}
log.WithoutContext().Println("Configuration loaded from flags.")
log.Print("Configuration loaded from flags")
return true, nil
}