mirror of
https://github.com/containers/podman.git
synced 2025-10-16 18:53:19 +08:00
a4d0067249
Instead of catching all signals and then ignoring them inside the loop again just don't register them in Notify() to begin with. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
53 lines
1.6 KiB
Go
53 lines
1.6 KiB
Go
//go:build (linux || freebsd) && !remote
|
|
|
|
package terminal
|
|
|
|
import (
|
|
"errors"
|
|
"os"
|
|
"syscall"
|
|
|
|
"github.com/containers/podman/v5/libpod"
|
|
"github.com/containers/podman/v5/libpod/define"
|
|
"github.com/containers/podman/v5/libpod/shutdown"
|
|
"github.com/containers/podman/v5/pkg/signal"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
// ProxySignals ...
|
|
func ProxySignals(ctr *libpod.Container) {
|
|
// Stop catching the shutdown signals (SIGINT, SIGTERM) - they're going
|
|
// to the container now.
|
|
shutdown.Stop() //nolint: errcheck
|
|
|
|
sigBuffer := make(chan os.Signal, signal.SignalBufferSize)
|
|
signal.CatchAll(sigBuffer)
|
|
|
|
logrus.Debugf("Enabling signal proxying")
|
|
|
|
go func() {
|
|
for s := range sigBuffer {
|
|
syscallSignal := s.(syscall.Signal)
|
|
|
|
if err := ctr.Kill(uint(syscallSignal)); err != nil {
|
|
// If the container is no longer running/removed do not log it as error.
|
|
if errors.Is(err, define.ErrCtrStateInvalid) || errors.Is(err, define.ErrNoSuchCtr) || errors.Is(err, define.ErrCtrRemoved) {
|
|
logrus.Infof("Ceasing signal forwarding to container %s as it has stopped", ctr.ID())
|
|
} else {
|
|
logrus.Errorf("forwarding signal %d to container %s: %v", s, ctr.ID(), err)
|
|
}
|
|
// 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.
|
|
signal.StopCatch(sigBuffer)
|
|
if err := syscall.Kill(syscall.Getpid(), s.(syscall.Signal)); err != nil {
|
|
logrus.Errorf("Failed to kill pid %d", syscall.Getpid())
|
|
}
|
|
return
|
|
}
|
|
}
|
|
}()
|
|
}
|