diff options
author | Matthew Heon <matthew.heon@pm.me> | 2020-03-09 09:49:27 -0400 |
---|---|---|
committer | Matthew Heon <matthew.heon@pm.me> | 2020-03-09 09:50:55 -0400 |
commit | 521ff14d83e387f39058c65361a68d83edae61ba (patch) | |
tree | aa96412a8edff1efdce26dd4d03c31df3f72a867 /libpod/oci.go | |
parent | ffce869daa6c4956bc1509b7b10726a266b74741 (diff) | |
download | podman-521ff14d83e387f39058c65361a68d83edae61ba.tar.gz podman-521ff14d83e387f39058c65361a68d83edae61ba.tar.bz2 podman-521ff14d83e387f39058c65361a68d83edae61ba.zip |
Revert "exec: get the exit code from sync pipe instead of file"
This reverts commit 4b72f9e4013411208751df2a92ab9f322d4da5b2.
Continues what began with revert of
d3d97a25e8c87cf741b2e24ac01ef84962137106 in previous commit.
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'libpod/oci.go')
-rw-r--r-- | libpod/oci.go | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/libpod/oci.go b/libpod/oci.go index 41d420664..27edebefc 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -70,7 +70,7 @@ type OCIRuntime interface { // ExecContainer executes a command in a running container. // Returns an int (exit code), error channel (errors from attach), and // error (errors that occurred attempting to start the exec session). - ExecContainer(ctr *Container, sessionID string, options *ExecOptions) (chan DataAndErr, chan error, error) + ExecContainer(ctr *Container, sessionID string, options *ExecOptions) (int, chan error, error) // ExecStopContainer stops a given exec session in a running container. // SIGTERM with be sent initially, then SIGKILL after the given timeout. // If timeout is 0, SIGKILL will be sent immediately, and SIGTERM will @@ -159,10 +159,3 @@ type HTTPAttachStreams struct { Stdout bool Stderr bool } - -// DataAndErr is a generic structure for passing around an int and an error -// it is especially useful for getting information from conmon -type DataAndErr struct { - data int - err error -} |