serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-14 06:46:27 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

logging: Warn for deprecated single_field encoder

Browse source
This commit is contained in:
Matthew Holt 2021-08-17 10:51:26 -06:00
parent 6bc87ea2ff
commit 8a974a4f8f
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
caddytest/integration/reverseproxy_test.go
View file

@ -371,7 +371,7 @@ func TestReverseProxyHealthCheck(t *testing.T) {
reverse_proxy { reverse_proxy {
to localhost:2020 to localhost:2020
health_path /health health_uri /health
health_port 2021 health_port 2021
health_interval 2s health_interval 2s
health_timeout 5s health_timeout 5s
@ -426,7 +426,7 @@ func TestReverseProxyHealthCheckUnixSocket(t *testing.T) {
reverse_proxy { reverse_proxy {
to unix/%s to unix/%s
health_path /health health_uri /health
health_port 2021 health_port 2021
health_interval 2s health_interval 2s
health_timeout 5s health_timeout 5s
@ -481,7 +481,7 @@ func TestReverseProxyHealthCheckUnixSocketWithoutPort(t *testing.T) {
reverse_proxy { reverse_proxy {
to unix/%s to unix/%s
health_path /health health_uri /health
health_interval 2s health_interval 2s
health_timeout 5s health_timeout 5s
} }

2
modules/caddyhttp/reverseproxy/caddyfile.go
View file

@ -61,7 +61,7 @@ func parseCaddyfile(h httpcaddyfile.Helper) (caddyhttp.MiddlewareHandler, error)
// lb_try_interval <interval> // lb_try_interval <interval>
// //
// # active health checking // # active health checking
// health_path <path> // health_uri <uri>
// health_port <port> // health_port <port>
// health_interval <interval> // health_interval <interval>
// health_timeout <duration> // health_timeout <duration>

1
modules/logging/encoders.go
View file

@ -135,6 +135,7 @@ func (SingleFieldEncoder) CaddyModule() caddy.ModuleInfo {
// Provision sets up the encoder. // Provision sets up the encoder.
func (se *SingleFieldEncoder) Provision(ctx caddy.Context) error { func (se *SingleFieldEncoder) Provision(ctx caddy.Context) error {
caddy.Log().Named("caddy.logging.encoders.single_field").Warn("the 'single_field' encoder is deprecated and will be removed soon!")
if se.FallbackRaw != nil { if se.FallbackRaw != nil {
val, err := ctx.LoadModule(se, "FallbackRaw") val, err := ctx.LoadModule(se, "FallbackRaw")
if err != nil { if err != nil {