From 556633ca47005c830c214543bcd0b0f18cbdcbe6 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 7 Mar 2025 00:27:12 +0100 Subject: [PATCH] cmd/dockerd: daemonCLI.start: scope local errors Scope errors locally and don't use special names if there's no reason for it. Signed-off-by: Sebastiaan van Stijn --- cmd/dockerd/daemon.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cmd/dockerd/daemon.go b/cmd/dockerd/daemon.go index e505100b84..c60b6e4b93 100644 --- a/cmd/dockerd/daemon.go +++ b/cmd/dockerd/daemon.go @@ -198,8 +198,7 @@ func (cli *daemonCLI) start(ctx context.Context) (err error) { // httpServer.Shutdown() will return immediately, // which is what we want. <-cli.apiShutdown - err := httpServer.Shutdown(apiShutdownCtx) - if err != nil { + if err := httpServer.Shutdown(apiShutdownCtx); err != nil { log.G(ctx).WithError(err).Error("Error shutting down http server") } close(apiShutdownDone) @@ -217,8 +216,8 @@ func (cli *daemonCLI) start(ctx context.Context) (err error) { // cli.start() has returned without cli.stop() being called, // e.g. because the daemon failed to start. // Stop the HTTP server with no grace period. - if closeErr := httpServer.Close(); closeErr != nil { - log.G(ctx).WithError(closeErr).Error("Error closing http server") + if err := httpServer.Close(); err != nil { + log.G(ctx).WithError(err).Error("Error closing http server") } } }()