0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #38497 from yongtang/go-vet

Browse source 
Fix go vet issue in daemon/daemon.go
This commit is contained in:
Akihiro Suda 2019-01-06 12:53:52 +09:00 • committed by GitHub
commit 16df93c231
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
daemon/daemon.go
View file

@ -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
}