diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-22 22:46:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-22 22:46:18 +0200 |
| commit | a12a2312ac5c6c485eaa1d45e4b7e29d6cc4a9ff (patch) | |
| tree | 2fe83dbecabff2df6aabfe7204418fd6fa05919e /pkg/varlinkapi/attach.go | |
| parent | cf9efa90e5dcf89e10408eae5229c4ce904d9fc7 (diff) | |
| parent | 53e1ede46b030ad2aeecbdd7b2a385b60500ac4c (diff) | |
| download | podman-a12a2312ac5c6c485eaa1d45e4b7e29d6cc4a9ff.tar.gz podman-a12a2312ac5c6c485eaa1d45e4b7e29d6cc4a9ff.tar.bz2 podman-a12a2312ac5c6c485eaa1d45e4b7e29d6cc4a9ff.zip | |
Merge pull request #3143 from haircommander/conmon-exec
use conmon for exec
Diffstat (limited to 'pkg/varlinkapi/attach.go')
| -rw-r--r-- | pkg/varlinkapi/attach.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkg/varlinkapi/attach.go b/pkg/varlinkapi/attach.go index afa88e6a3..97ba525a5 100644 --- a/pkg/varlinkapi/attach.go +++ b/pkg/varlinkapi/attach.go @@ -82,9 +82,10 @@ func (i *LibpodAPI) Attach(call iopodman.VarlinkCall, name string, detachKeys st if finalErr != define.ErrDetach && finalErr != nil { logrus.Error(finalErr) } - quitWriter := virtwriter.NewVirtWriteCloser(writer, virtwriter.Quit) - _, err = quitWriter.Write([]byte("HANG-UP")) - // TODO error handling is not quite right here yet + + if err = virtwriter.HangUp(writer); err != nil { + logrus.Errorf("Failed to HANG-UP attach to %s: %s", ctr.ID(), err.Error()) + } return call.Writer.Flush() } |