From 72b0411ee0bb6267eba5514f092ec7aeb33940b1 Mon Sep 17 00:00:00 2001 From: jholdstock Date: Sat, 16 Sep 2023 08:05:58 +0100 Subject: [PATCH] webapi: Refine server start/stop logging. Don't log errors returned by server.Shutdown. They are exceedingly unlikely, and there is nothing which can be done about them. Moving the "Listening on..." log closer to where the server is actually started reduces the chance of confusion. Also, logging the parsed listener.Addr() string instead of the provided config string provides extra debugging detail. --- internal/webapi/webapi.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/internal/webapi/webapi.go b/internal/webapi/webapi.go index b7cd3ec..9499759 100644 --- a/internal/webapi/webapi.go +++ b/internal/webapi/webapi.go @@ -120,7 +120,6 @@ func New(vdb *database.VspDatabase, log slog.Logger, dcrd rpc.DcrdConnect, if err != nil { return nil, err } - log.Infof("Listening on %s", cfg.Listen) w := &WebAPI{ cfg: cfg, @@ -152,17 +151,16 @@ func (w *WebAPI) Run(ctx context.Context) { <-ctx.Done() w.log.Debug("Stopping webserver...") - if err := w.server.Shutdown(ctx); err != nil { - w.log.Errorf("Failed to stop webserver cleanly: %v", err) - } else { - w.log.Debug("Webserver stopped") - } + _ = w.server.Shutdown(ctx) + w.log.Debug("Webserver stopped") + wg.Done() }() // Start webserver. wg.Add(1) go func() { + w.log.Infof("Listening on %s", w.listener.Addr()) err := w.server.Serve(w.listener) // ErrServerClosed is expected from a graceful server shutdown, it can // be ignored. Anything else should be logged.