From d20c1a9911b2614640ef3c417a5b7af7254f52b5 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Tue, 6 Feb 2018 13:31:21 -0500 Subject: Change stop signal default to SIGTERM Signed-off-by: Matthew Heon Closes: #299 Approved by: rhatdan --- cmd/podman/create.go | 2 +- libpod/oci.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/podman/create.go b/cmd/podman/create.go index ac6bc2969..b3aa42b8a 100644 --- a/cmd/podman/create.go +++ b/cmd/podman/create.go @@ -527,7 +527,7 @@ func parseCreateOpts(c *cli.Context, runtime *libpod.Runtime, imageName string, } // STOP SIGNAL - stopSignal := syscall.SIGINT + stopSignal := syscall.SIGTERM signalString := data.Config.StopSignal if c.IsSet("stop-signal") { signalString = c.String("stop-signal") diff --git a/libpod/oci.go b/libpod/oci.go index 4ca0bfbef..86313a493 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -394,6 +394,7 @@ func (r *OCIRuntime) startContainer(ctr *Container) error { // killContainer sends the given signal to the given container 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 { return errors.Wrapf(err, "error sending signal to container %s", ctr.ID()) } -- cgit v1.2.3-54-g00ecf