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

daemon: Daemon.autoRemove: fix shadowing (govet)

Browse Source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2024-11-05 16:44:18 +01:00
parent 007daf5045
commit 79c5b938f4
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
daemon/monitor.go
View File

@@ -307,12 +307,11 @@ func (daemon *Daemon) autoRemove(cfg *config.Config, c *container.Container) {
}
err := daemon.containerRm(cfg, c.ID, &backend.ContainerRmConfig{ForceRemove: true, RemoveVolume: true})
if err == nil {
return
if err != nil {
if daemon.containers.Get(c.ID) == nil {
// container no longer found, so remove worked after all.
return
}
log.G(context.TODO()).WithFields(log.Fields{"error": err, "container": c.ID}).Error("error removing container")
}
if c := daemon.containers.Get(c.ID); c == nil {
return
}
log.G(context.TODO()).WithFields(log.Fields{"error": err, "container": c.ID}).Error("error removing container")
}