diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-11 01:22:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-11 01:22:30 +0200 |
| commit | e2e8477f83f717d6a92badd317ae909cf185d04e (patch) | |
| tree | 266259131bc70764b737cc65579641bd8140c533 /pkg/hooks/exec/exec.go | |
| parent | df3f5afad13c91a6f2be9e83ae328483e047c13c (diff) | |
| parent | e053e0e05ecd884067125627f0006d1b6e19226e (diff) | |
| download | podman-e2e8477f83f717d6a92badd317ae909cf185d04e.tar.gz podman-e2e8477f83f717d6a92badd317ae909cf185d04e.tar.bz2 podman-e2e8477f83f717d6a92badd317ae909cf185d04e.zip | |
Merge pull request #3521 from baude/golangcilint1
first pass of corrections for golangci-lint
Diffstat (limited to 'pkg/hooks/exec/exec.go')
| -rw-r--r-- | pkg/hooks/exec/exec.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkg/hooks/exec/exec.go b/pkg/hooks/exec/exec.go index 0dd091561..4038e3d94 100644 --- a/pkg/hooks/exec/exec.go +++ b/pkg/hooks/exec/exec.go @@ -5,6 +5,7 @@ import ( "bytes" "context" "fmt" + "github.com/sirupsen/logrus" "io" osexec "os/exec" "time" @@ -54,7 +55,9 @@ func Run(ctx context.Context, hook *rspec.Hook, state []byte, stdout io.Writer, case err = <-exit: return err, err case <-ctx.Done(): - cmd.Process.Kill() + if err := cmd.Process.Kill(); err != nil { + logrus.Errorf("failed to kill pid %v", cmd.Process) + } timer := time.NewTimer(postKillTimeout) defer timer.Stop() select { |