kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #26005 from q384566678/branch-test 

Optimize the restart function code
This commit is contained in:
Michael Crosby 2016-08-26 15:14:49 -07:00 committed by GitHub
parent bdadcfc1bb 870cf1096f
commit 07328cf3f6
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/restart.go
View File

@ -36,6 +36,7 @@ func (daemon *Daemon) containerRestart(container *container.Container, seconds i
defer daemon.Unmount(container)
}
if container.IsRunning() {
// set AutoRemove flag to false before stop so the container won't be
// removed during restart process
autoRemove := container.HostConfig.AutoRemove
@ -53,8 +54,9 @@ func (daemon *Daemon) containerRestart(container *container.Container, seconds i
if err != nil {
return err
}
}
if err = daemon.containerStart(container); err != nil {
if err := daemon.containerStart(container); err != nil {
return err
}