diff --git a/internal/home/control.go b/internal/home/control.go index 61028bd4..910ab50a 100644 --- a/internal/home/control.go +++ b/internal/home/control.go @@ -14,7 +14,6 @@ import ( "github.com/AdguardTeam/AdGuardHome/internal/dnsforward" "github.com/AdguardTeam/AdGuardHome/internal/version" "github.com/AdguardTeam/golibs/httphdr" - "github.com/AdguardTeam/golibs/log" "github.com/AdguardTeam/golibs/netutil" "github.com/AdguardTeam/golibs/netutil/urlutil" "github.com/NYTimes/gziphandler" @@ -207,11 +206,7 @@ func ensure( handler func(http.ResponseWriter, *http.Request), ) (wrapped func(http.ResponseWriter, *http.Request)) { return func(w http.ResponseWriter, r *http.Request) { - start := time.Now() - m, u := r.Method, r.URL - log.Debug("started %s %s %s", m, r.Host, u) - defer func() { log.Debug("finished %s %s %s in %s", m, r.Host, u, time.Since(start)) }() - + m := r.Method if m != method { aghhttp.Error(r, w, http.StatusMethodNotAllowed, "only method %s is allowed", method) diff --git a/internal/home/web.go b/internal/home/web.go index 0ea0272b..ca762c95 100644 --- a/internal/home/web.go +++ b/internal/home/web.go @@ -228,6 +228,10 @@ func (web *webAPI) start(ctx context.Context) { logger := web.baseLogger.With(loggerKeyServer, "plain") + // TODO(a.garipov): Remove other logs like this in other code. + logMw := httputil.NewLogMiddleware(logger, slog.LevelDebug) + hdlr = logMw.Wrap(hdlr) + // Create a new instance, because the Web is not usable after Shutdown. web.httpServer = &http.Server{ Addr: web.conf.BindAddr.String(), @@ -238,7 +242,9 @@ func (web *webAPI) start(ctx context.Context) { ErrorLog: slog.NewLogLogger(logger.Handler(), slog.LevelError), } go func() { - defer slogutil.RecoverAndLog(ctx, web.logger) + defer slogutil.RecoverAndLog(ctx, logger) + + logger.InfoContext(ctx, "starting plain server", "addr", web.httpServer.Addr) errs <- web.httpServer.ListenAndServe() }() @@ -305,9 +311,13 @@ func (web *webAPI) tlsServerLoop(ctx context.Context) { addr := netip.AddrPortFrom(web.conf.BindAddr.Addr(), portHTTPS).String() logger := web.baseLogger.With(loggerKeyServer, "https") + // TODO(a.garipov): Remove other logs like this in other code. + logMw := httputil.NewLogMiddleware(logger, slog.LevelDebug) + hdlr := logMw.Wrap(withMiddlewares(Context.mux, limitRequestBody)) + web.httpsServer.server = &http.Server{ Addr: addr, - Handler: withMiddlewares(Context.mux, limitRequestBody), + Handler: hdlr, TLSConfig: &tls.Config{ Certificates: []tls.Certificate{web.httpsServer.cert}, RootCAs: Context.tlsRoots, @@ -326,7 +336,7 @@ func (web *webAPI) tlsServerLoop(ctx context.Context) { go web.mustStartHTTP3(ctx, addr) } - web.logger.DebugContext(ctx, "starting https server") + logger.InfoContext(ctx, "starting https server") err := web.httpsServer.server.ListenAndServeTLS("", "") if !errors.Is(err, http.ErrServerClosed) { cleanupAlways()