mirror of https://github.com/docker/docs.git
Remove dead code from daemon/daemon.go
fix #12492 Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
This commit is contained in:
parent
6cba3109c2
commit
accbbfeae4
|
@ -225,7 +225,6 @@ func (daemon *Daemon) register(container *Container, updateSuffixarray bool) err
|
||||||
if container.IsRunning() {
|
if container.IsRunning() {
|
||||||
logrus.Debugf("killing old running container %s", container.ID)
|
logrus.Debugf("killing old running container %s", container.ID)
|
||||||
|
|
||||||
existingPid := container.Pid
|
|
||||||
container.SetStopped(&execdriver.ExitStatus{ExitCode: 0})
|
container.SetStopped(&execdriver.ExitStatus{ExitCode: 0})
|
||||||
|
|
||||||
// We only have to handle this for lxc because the other drivers will ensure that
|
// We only have to handle this for lxc because the other drivers will ensure that
|
||||||
|
@ -237,11 +236,6 @@ func (daemon *Daemon) register(container *Container, updateSuffixarray bool) err
|
||||||
cmd := &execdriver.Command{
|
cmd := &execdriver.Command{
|
||||||
ID: container.ID,
|
ID: container.ID,
|
||||||
}
|
}
|
||||||
var err error
|
|
||||||
cmd.ProcessConfig.Process, err = os.FindProcess(existingPid)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Debugf("cannot find existing process for %d", existingPid)
|
|
||||||
}
|
|
||||||
daemon.execDriver.Terminate(cmd)
|
daemon.execDriver.Terminate(cmd)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue