InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/dockerd: daemonCLI.start: scope local errors

Browse Source 
Scope errors locally and don't use special names if there's no reason
for it.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-03-07 00:27:12 +01:00
parent 8b59e1a398
commit 556633ca47
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/dockerd/daemon.go
View File

@@ -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")
}
}
}()