opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-02 02:26:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change stop signal default to SIGTERM

Browse Source 
Signed-off-by: Matthew Heon <mheon@redhat.com>

Closes: #299
Approved by: rhatdan
This commit is contained in:
Matthew Heon
2018-02-06 13:31:21 -05:00
committed by Atomic Bot
parent 0d7e6fa22f
commit d20c1a9911
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/create.go
View File

@ -527,7 +527,7 @@ func parseCreateOpts(c *cli.Context, runtime *libpod.Runtime, imageName string,
} }
// STOP SIGNAL // STOP SIGNAL
stopSignal := syscall.SIGINT stopSignal := syscall.SIGTERM
signalString := data.Config.StopSignal signalString := data.Config.StopSignal
if c.IsSet("stop-signal") { if c.IsSet("stop-signal") {
signalString = c.String("stop-signal") signalString = c.String("stop-signal")

1
libpod/oci.go
View File

@ -394,6 +394,7 @@ func (r *OCIRuntime) startContainer(ctr *Container) error {
// killContainer sends the given signal to the given container // killContainer sends the given signal to the given container
func (r *OCIRuntime) killContainer(ctr *Container, signal uint) error { func (r *OCIRuntime) killContainer(ctr *Container, signal uint) error {
logrus.Debugf("Sending signal %d to container %s", signal, ctr.ID())
if err := utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, r.path, "kill", ctr.ID(), fmt.Sprintf("%d", signal)); err != nil { if err := utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, r.path, "kill", ctr.ID(), fmt.Sprintf("%d", signal)); err != nil {
return errors.Wrapf(err, "error sending signal to container %s", ctr.ID()) return errors.Wrapf(err, "error sending signal to container %s", ctr.ID())
} }