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

Merge pull request #17923 from LK4D4/simple_ckill

Browse source 
daemon/kill.go: simplify if statement
This commit is contained in:
Brian Goff 2015-11-12 05:36:40 -05:00
commit b6899ad56f
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
daemon/kill.go
View file

@ -27,16 +27,9 @@ func (daemon *Daemon) ContainerKill(name string, sig uint64) error {
// If no signal is passed, or SIGKILL, perform regular Kill (SIGKILL + wait())
if sig == 0 || syscall.Signal(sig) == syscall.SIGKILL {
if err := daemon.Kill(container); err != nil {
return err
}
} else {
// Otherwise, just send the requested signal
if err := daemon.killWithSignal(container, int(sig)); err != nil {
return err
}
return daemon.Kill(container)
}
return nil
return daemon.killWithSignal(container, int(sig))
}
// killWithSignal sends the container the given signal. This wrapper for the