From 7315a2bb11325bdab36d0325be5f780414e660a7 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Sat, 5 Jan 2019 08:04:21 +0000 Subject: [PATCH] Fix go vet issue in daemon/daemon.go This fix fixes go vet issue: ``` daemon/daemon.go:273: loop variable id captured by func literal daemon/daemon.go:280: loop variable id captured by func literal ``` Signed-off-by: Yong Tang --- daemon/daemon.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/daemon.go b/daemon/daemon.go index c37d7c9f77..651a57a139 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -260,7 +260,7 @@ func (daemon *Daemon) restore() error { restartContainers := make(map[*container.Container]chan struct{}) activeSandboxes := make(map[string]interface{}) - for id, c := range containers { + for _, c := range containers { group.Add(1) go func(c *container.Container) { defer group.Done() @@ -270,14 +270,14 @@ func (daemon *Daemon) restore() error { if err := daemon.registerName(c); err != nil { logrus.Errorf("Failed to register container name %s: %s", c.ID, err) mapLock.Lock() - delete(containers, id) + delete(containers, c.ID) mapLock.Unlock() return } if err := daemon.Register(c); err != nil { logrus.Errorf("Failed to register container %s: %s", c.ID, err) mapLock.Lock() - delete(containers, id) + delete(containers, c.ID) mapLock.Unlock() return }