mirror of
https://github.com/containers/podman.git
synced 2025-08-06 19:44:14 +08:00
868ee6db70
When stopping signal handling (e.g., to properly handle ^C) we are also closing the signal channel. We should really return from the go-routine instead of continuing and risking double-closing the channel which leads to a panic. Fixes: #5034 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
43 lines
1.1 KiB
Go
43 lines
1.1 KiB
Go
package adapter
|
|
|
|
import (
|
|
"os"
|
|
"syscall"
|
|
|
|
"github.com/containers/libpod/libpod"
|
|
"github.com/docker/docker/pkg/signal"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
// ProxySignals ...
|
|
func ProxySignals(ctr *libpod.Container) {
|
|
sigBuffer := make(chan os.Signal, 128)
|
|
signal.CatchAll(sigBuffer)
|
|
|
|
logrus.Debugf("Enabling signal proxying")
|
|
|
|
go func() {
|
|
for s := range sigBuffer {
|
|
// Ignore SIGCHLD and SIGPIPE - these are mostly likely
|
|
// intended for the podman command itself.
|
|
if s == signal.SIGCHLD || s == signal.SIGPIPE {
|
|
continue
|
|
}
|
|
|
|
if err := ctr.Kill(uint(s.(syscall.Signal))); err != nil {
|
|
// If the container dies, and we find out here,
|
|
// we need to forward that one signal to
|
|
// ourselves so that it is not lost, and then
|
|
// we terminate the proxy and let the defaults
|
|
// play out.
|
|
logrus.Errorf("Error forwarding signal %d to container %s: %v", s, ctr.ID(), err)
|
|
signal.StopCatch(sigBuffer)
|
|
if err := syscall.Kill(syscall.Getpid(), s.(syscall.Signal)); err != nil {
|
|
logrus.Errorf("failed to kill pid %d", syscall.Getpid())
|
|
}
|
|
return
|
|
}
|
|
}
|
|
}()
|
|
}
|