opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 11:32:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "exec: get the exit code from sync pipe instead of file"

Browse Source 
This reverts commit 4b72f9e4013411208751df2a92ab9f322d4da5b2.

Continues what began with revert of
d3d97a25e8c87cf741b2e24ac01ef84962137106 in previous commit.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
This commit is contained in:
Matthew Heon
2020-03-09 09:49:27 -04:00
parent ffce869daa
commit 521ff14d83
6 changed files with 63 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libpod/oci.go
View File

@ -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
}