diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-24 13:16:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-24 13:16:21 +0200 |
| commit | eae9a009b2038d78a2cc92db740c99b1b8dc0101 (patch) | |
| tree | 0bcbb02a1110495b7fb46eb4c8f3776a0849efaf /pkg/varlinkapi/attach.go | |
| parent | 0d441f57d64bcca16c14ca44b7c8f35ab687ea3f (diff) | |
| parent | 01a8483a59eed8bc706b5219b903704544b66c10 (diff) | |
| download | podman-eae9a009b2038d78a2cc92db740c99b1b8dc0101.tar.gz podman-eae9a009b2038d78a2cc92db740c99b1b8dc0101.tar.bz2 podman-eae9a009b2038d78a2cc92db740c99b1b8dc0101.zip | |
Merge pull request #3624 from haircommander/conmon-exec-with-remote-exec
Add remote exec
Diffstat (limited to 'pkg/varlinkapi/attach.go')
| -rw-r--r-- | pkg/varlinkapi/attach.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/varlinkapi/attach.go b/pkg/varlinkapi/attach.go index 97ba525a5..1f8d48eb9 100644 --- a/pkg/varlinkapi/attach.go +++ b/pkg/varlinkapi/attach.go @@ -68,7 +68,7 @@ func (i *LibpodAPI) Attach(call iopodman.VarlinkCall, name string, detachKeys st reader, writer, _, pw, streams := setupStreams(call) go func() { - if err := virtwriter.Reader(reader, nil, nil, pw, resize); err != nil { + if err := virtwriter.Reader(reader, nil, nil, pw, resize, nil); err != nil { errChan <- err } }() @@ -83,7 +83,7 @@ func (i *LibpodAPI) Attach(call iopodman.VarlinkCall, name string, detachKeys st logrus.Error(finalErr) } - if err = virtwriter.HangUp(writer); err != nil { + if err = virtwriter.HangUp(writer, 0); err != nil { logrus.Errorf("Failed to HANG-UP attach to %s: %s", ctr.ID(), err.Error()) } return call.Writer.Flush() |