From 95f20fc753aa3c6f2b408f5691fe0786ae77108b Mon Sep 17 00:00:00 2001 From: Daniel Anugerah Date: Fri, 20 Dec 2024 21:18:04 +0800 Subject: [PATCH 1/2] Configure ErrorLog in httputil.ReverseProxy --- pkg/server/service/proxy.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/server/service/proxy.go b/pkg/server/service/proxy.go index 257c4ce0d..13d107a32 100644 --- a/pkg/server/service/proxy.go +++ b/pkg/server/service/proxy.go @@ -5,6 +5,7 @@ import ( "errors" "fmt" "io" + stdlog "log" "net" "net/http" "net/http/httputil" @@ -12,6 +13,7 @@ import ( "strings" "time" + "github.com/sirupsen/logrus" ptypes "github.com/traefik/paerser/types" "github.com/traefik/traefik/v2/pkg/config/dynamic" "github.com/traefik/traefik/v2/pkg/log" @@ -81,6 +83,7 @@ func buildProxy(passHostHeader *bool, responseForwarding *dynamic.ResponseForwar Transport: roundTripper, FlushInterval: time.Duration(flushInterval), BufferPool: bufferPool, + ErrorLog: stdlog.New(log.WithoutContext().WriterLevel(logrus.DebugLevel), "", 0), ErrorHandler: func(w http.ResponseWriter, request *http.Request, err error) { statusCode := http.StatusInternalServerError From 35ce6baaae951127da9f938ee40edae6367a52ce Mon Sep 17 00:00:00 2001 From: Kevin Pollet Date: Fri, 20 Dec 2024 14:36:06 +0100 Subject: [PATCH 2/2] Bump golang.org/x/net to v0.33.0 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5d19f45f3..40a12d07f 100644 --- a/go.mod +++ b/go.mod @@ -69,7 +69,7 @@ require ( go.elastic.co/apm/v2 v2.4.8 golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // No tag on the repo. golang.org/x/mod v0.21.0 - golang.org/x/net v0.30.0 + golang.org/x/net v0.33.0 golang.org/x/text v0.21.0 golang.org/x/time v0.7.0 golang.org/x/tools v0.25.0 diff --git a/go.sum b/go.sum index 6e96dadd4..850336bc6 100644 --- a/go.sum +++ b/go.sum @@ -1600,8 +1600,8 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= -golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= -golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=