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

log.loglevel becomes log.level in configuration

Browse source
This commit is contained in:
Julien Salleyron 2019-04-16 15:30:09 +02:00 committed by Traefiker Bot
parent e6bdfa1d29
commit bb8a193244
72 changed files with 78 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE.md vendored
View file

@ -76,7 +76,7 @@ Add more configuration information here.
-->
### If applicable, please paste the log output at DEBUG level (`--logLevel=DEBUG` switch)
### If applicable, please paste the log output at DEBUG level (`--log.level=DEBUG` switch)
```
(paste your output here)

2
.github/ISSUE_TEMPLATE/Bug_report.md vendored
View file

@ -81,7 +81,7 @@ Add more configuration information here.
-->
### If applicable, please paste the log output in DEBUG level (`--logLevel=DEBUG` switch)
### If applicable, please paste the log output in DEBUG level (`--log.level=DEBUG` switch)
```
(paste your output here)

2
cmd/traefik/traefik.go
View file

@ -317,7 +317,7 @@ func configureLogging(staticConfiguration *static.Configuration) {
// otherwise.
var levelStr string
if staticConfiguration.Log != nil {
levelStr = strings.ToLower(staticConfiguration.Log.LogLevel)
levelStr = strings.ToLower(staticConfiguration.Log.Level)
}
if levelStr == "" {
levelStr = "error"

4
docs/content/observability/logs.md
View file

@ -37,9 +37,9 @@ You can configure a file path instead using the `filePath` option.
By default, the logs use a text format (`common`), but you can also ask for the `json` format in the `format` option.
#### logLevel
#### log level
By default, the `logLevel` is set to `error`, but you can choose amongst `debug`, `panic`, `fatal`, `error`, `warn`, and `info`.
By default, the `level` is set to `error`, but you can choose amongst `debug`, `panic`, `fatal`, `error`, `warn`, and `info`.
## Log Rotation

4
docs/content/reference/static-configuration.toml
View file

@ -152,7 +152,7 @@
Middlewares = ["foobar", "foobar"]
[Log]
LogLevel = "foobar"
Level = "foobar"
FilePath = "foobar"
Format = "foobar"
@ -205,7 +205,7 @@
[Tracing.Instana]
LocalAgentHost = "foobar"
LocalAgentPort = 42
LogLevel = "foobar"
Level = "foobar"
[HostResolver]
CnameFlattening = true

8
docs/content/reference/static-configuration.txt
View file

@ -40,13 +40,13 @@
--api.middlewares Middleware list
--api.statistics Enable more detailed statistics (default "true")
--api.statistics.recenterrors Number of recent errors logged (default "10")
-c, --configfile Configuration file to use (TOML).
-c, --configfile Configuration file to use (TOML).
--entrypoints Entrypoints definition using format: --entryPoints='Name:http Address::8000 (default "map[]")
Redirect.EntryPoint:https' --entryPoints='Name:https Address::4442
TLS:tests/traefik.crt,tests/traefik.key;prod/traefik.crt,prod/traefik.key'
--global Global configuration options (default "true")
--global.checknewversion Periodically check if a new version has been released (default "true")
-d, --global.debug Enable debug mode (default "false")
-d, --global.debug Enable debug mode (default "false")
--global.sendanonymoususage send periodically anonymous usage statistics (default "false")
--hostresolver Enable CNAME Flattening (default "false")
--hostresolver.cnameflattening A flag to enable/disable CNAME flattening (default "false")
@ -55,7 +55,7 @@
--log Traefik log settings (default "false")
--log.filepath Traefik log file path. Stdout is used when omitted or empty
--log.format Traefik log format: json | common (default "common")
--log.loglevel Log level set to traefik logs.
--log.level Log level set to traefik logs.
--metrics Enable a metrics exporter (default "false")
--metrics.datadog DataDog metrics exporter type (default "false")
--metrics.datadog.address DataDog's address (default "localhost:8125")
@ -193,4 +193,4 @@
--tracing.zipkin.id128bit Use Zipkin 128 bit root span IDs. (default "true")
--tracing.zipkin.samespan Use Zipkin SameSpan RPC style traces. (default "false")
--tracing.zipkin.samplerate The rate between 0.0 and 1.0 of requests to trace. (default "1")
-h, --help Print Help (this message) and exit
-h, --help Print Help (this message) and exit

2
integration/fixtures/access_log_config.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "ERROR"
level = "ERROR"
filePath = "traefik.log"
[accessLog]

2
integration/fixtures/acme/acme_base.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/acme/acme_tls.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/acme/acme_tls_dynamic.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/acme/acme_tls_multiple_entrypoints.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/docker/minimal.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/docker/simple.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/error_pages/error.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/error_pages/simple.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/file/56-simple-panic.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/file/directory.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/file/simple.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/grpc/config.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[serversTransport]
rootCAs = [ """{{ .CertContent }}""" ]

2
integration/fixtures/grpc/config_h2c.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/grpc/config_h2c_termination.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web-secure]

2
integration/fixtures/grpc/config_insecure.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[serversTransport]
insecureSkipVerify = true

2
integration/fixtures/grpc/config_retry.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[serversTransport]
rootCAs = [ """{{ .CertContent }}""" ]

2
integration/fixtures/grpc/config_with_flush.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[serversTransport]
rootCAs = [ """{{ .CertContent }}""" ]

2
integration/fixtures/headers/basic.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/headers/cors.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/healthcheck/multiple-entrypoints-drr.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.http1]

2
integration/fixtures/healthcheck/multiple-entrypoints-wrr.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.http1]

2
integration/fixtures/healthcheck/port_overload.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/healthcheck/simple.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/https/clientca/https_1ca1config.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web-secure]

2
integration/fixtures/https/clientca/https_2ca1config.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web-secure]

2
integration/fixtures/https/clientca/https_2ca2config.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web-secure]

2
integration/fixtures/https/dynamic_https_sni.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web-secure]

2
integration/fixtures/https/dynamic_https_sni_default_cert.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web-secure]

2
integration/fixtures/https/https_redirect.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/https/https_sni.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web-secure]

2
integration/fixtures/https/https_sni_case_insensitive_dynamic.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web-secure]

2
integration/fixtures/https/https_sni_default_cert.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web-secure]

2
integration/fixtures/https/https_sni_strict.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web-secure]

2
integration/fixtures/https/rootcas/https.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[serversTransport]
# Use certificate in net/internal/testcert.go

2
integration/fixtures/https/rootcas/https_with_file.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[serversTransport]
# Use certificate in net/internal/testcert.go

2
integration/fixtures/k8s_crd.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/k8s_default.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/log_rotation_config.toml
View file

@ -4,7 +4,7 @@ sendAnonymousUsage = false
[log]
filePath = "traefik.log"
logLevel = "ERROR"
level = "ERROR"
[accessLog]
filePath = "access.log"

2
integration/fixtures/marathon/simple.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/multiple_provider.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/multiprovider.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[api]

2
integration/fixtures/proxy-protocol/with.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/proxy-protocol/without.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/ratelimit/simple.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/reqacceptgrace.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/rest/simple.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/retry/simple.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/simple_auth.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/simple_hostresolver.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/simple_stats.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/simple_web.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/simple_whitelist.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/tcp/mixed.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.tcp]

2
integration/fixtures/tcp/non-tls-fallback.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.tcp]

2
integration/fixtures/tcp/non-tls.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.tcp]

2
integration/fixtures/timeout/forwarding_timeouts.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[serversTransport.forwardingTimeouts]
dialTimeout = "300ms"

2
integration/fixtures/tlsclientheaders/simple.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[serversTransport]
rootCAs = [ """{{ .RootCertContent }}""" ]

2
integration/fixtures/tracing/simple.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[api]

2
integration/fixtures/traefik_log_config.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
filePath = "traefik.log"
[accessLog]

2
integration/fixtures/websocket/config.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[entryPoints]
[entryPoints.web]

2
integration/fixtures/websocket/config_https.toml
View file

@ -3,7 +3,7 @@ checkNewVersion = false
sendAnonymousUsage = false
[log]
logLevel = "DEBUG"
level = "DEBUG"
[serversTransport]
insecureSkipVerify=true

2
pkg/anonymize/anonymize_config_test.go
View file

@ -58,7 +58,7 @@ func TestDo_globalConfiguration(t *testing.T) {
}
config.Log = &types.TraefikLog{
LogLevel: "LogLevel",
Level: "Level",
FilePath: "/foo/path",
Format: "json",
}

4
pkg/anonymize/anonymize_doOnJSON_test.go
View file

@ -14,7 +14,7 @@ func Test_doOnJSON(t *testing.T) {
"CheckNewVersion": true,
"AccessLogsFile": "",
"TraefikLogsFile": "",
"LogLevel": "ERROR",
"Level": "ERROR",
"EntryPoints": {
"http": {
"Network": "",
@ -97,7 +97,7 @@ func Test_doOnJSON(t *testing.T) {
"CheckNewVersion": true,
"AccessLogsFile": "",
"TraefikLogsFile": "",
"LogLevel": "ERROR",
"Level": "ERROR",
"EntryPoints": {
"http": {
"Network": "",

2
pkg/types/logs.go
View file

@ -18,7 +18,7 @@ const (
// TraefikLog holds the configuration settings for the traefik logger.
type TraefikLog struct {
LogLevel string `description:"Log level set to traefik logs." export:"true"`
Level string `description:"Log level set to traefik logs." export:"true"`
FilePath string `json:"file,omitempty" description:"Traefik log file path. Stdout is used when omitted or empty"`
Format string `json:"format,omitempty" description:"Traefik log format: json | common"`
}

2
traefik.sample.toml
View file

@ -40,7 +40,7 @@
# Optional
# Default: "ERROR"
#
# logLevel = "DEBUG"
# level = "DEBUG"
# Sets the filepath for the traefik log. If not specified, stdout will be used.
# Intermediate directories are created if necessary.