mirror of https://github.com/portainer/portainer
fix(http): log HTTP server errors as DEBUG level EE-5225 (#9060)
parent
2d69e93efa
commit
424c98e256
|
@ -0,0 +1,19 @@
|
|||
package http
|
||||
|
||||
import (
|
||||
"log"
|
||||
|
||||
zlog "github.com/rs/zerolog/log"
|
||||
)
|
||||
|
||||
type httpLogger struct{}
|
||||
|
||||
func NewHTTPLogger() *log.Logger {
|
||||
return log.New(&httpLogger{}, "", 0)
|
||||
}
|
||||
|
||||
func (l *httpLogger) Write(data []byte) (int, error) {
|
||||
zlog.Debug().CallerSkipFrame(3).Msg(string(data))
|
||||
|
||||
return len(data), nil
|
||||
}
|
|
@ -327,13 +327,16 @@ func (server *Server) Start() error {
|
|||
WebhookHandler: webhookHandler,
|
||||
}
|
||||
|
||||
errorLogger := NewHTTPLogger()
|
||||
|
||||
handler := adminMonitor.WithRedirect(offlineGate.WaitingMiddleware(time.Minute, server.Handler))
|
||||
if server.HTTPEnabled {
|
||||
go func() {
|
||||
log.Info().Str("bind_address", server.BindAddress).Msg("starting HTTP server")
|
||||
httpServer := &http.Server{
|
||||
Addr: server.BindAddress,
|
||||
Handler: handler,
|
||||
Addr: server.BindAddress,
|
||||
Handler: handler,
|
||||
ErrorLog: errorLogger,
|
||||
}
|
||||
|
||||
go shutdown(server.ShutdownCtx, httpServer)
|
||||
|
@ -349,6 +352,7 @@ func (server *Server) Start() error {
|
|||
httpsServer := &http.Server{
|
||||
Addr: server.BindAddressHTTPS,
|
||||
Handler: handler,
|
||||
ErrorLog: errorLogger,
|
||||
TLSNextProto: make(map[string]func(*http.Server, *tls.Conn, http.Handler)), // Disable HTTP/2
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue