summaryrefslogtreecommitdiff
path: root/pkg/adapter/sigproxy_linux.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-04-16 14:04:58 -0700
committerGitHub <noreply@github.com>2020-04-16 14:04:58 -0700
commit0d2b5532c417c58bd24e71a56c5c55b43e423a59 (patch)
tree4001e8e47a022bb1b9bfbf2332c42e1aeb802f9e /pkg/adapter/sigproxy_linux.go
parent88c6fd06cd54fb9a8826306dfdf1a77e400de5de (diff)
parent241326a9a8c20ad7f2bcf651416b836e7778e090 (diff)
downloadpodman-0d2b5532c417c58bd24e71a56c5c55b43e423a59.tar.gz
podman-0d2b5532c417c58bd24e71a56c5c55b43e423a59.tar.bz2
podman-0d2b5532c417c58bd24e71a56c5c55b43e423a59.zip
Merge pull request #5852 from baude/v1prune
Podman V2 birth
Diffstat (limited to 'pkg/adapter/sigproxy_linux.go')
-rw-r--r--pkg/adapter/sigproxy_linux.go45
1 files changed, 0 insertions, 45 deletions
diff --git a/pkg/adapter/sigproxy_linux.go b/pkg/adapter/sigproxy_linux.go
deleted file mode 100644
index 5695d0e42..000000000
--- a/pkg/adapter/sigproxy_linux.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package adapter
-
-import (
- "os"
- "syscall"
-
- "github.com/containers/libpod/libpod"
- "github.com/containers/libpod/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.
- // SIGURG was added because of golang 1.14 and its preemptive changes
- // causing more signals to "show up".
- // https://github.com/containers/libpod/issues/5483
- if s == syscall.SIGCHLD || s == syscall.SIGPIPE || s == syscall.SIGURG {
- 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
- }
- }
- }()
-}