luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Don't fall through

This commit is contained in:
Alex Dadgar 2019-01-28 09:53:19 -08:00
parent 403faa0d7c
commit 991bcc3ef1
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/docker/handle.go
View File

@ -136,14 +136,14 @@ func (h *taskHandle) Kill(killTimeout time.Duration, signal os.Signal) error {
return nil
}
// Drop through to just attempting to stop the container
h.logger.Error("failed to signal container while killing", "error", err)
} else {
select {
case <-h.waitCh:
return nil
case <-time.After(killTimeout):
}
return fmt.Errorf("Failed to signal container %q while killing: %v", h.containerID, err)
}
select {
case <-h.waitCh:
return nil
case <-time.After(killTimeout):
}
}
@ -165,6 +165,7 @@ func (h *taskHandle) Kill(killTimeout time.Duration, signal os.Signal) error {
h.logger.Error("failed to stop container", "error", err)
return fmt.Errorf("Failed to stop container %s: %s", h.containerID, err)
}
h.logger.Info("stopped container")
return nil
}