diff options
Diffstat (limited to 'pkg/varlinkapi/attach.go')
| -rw-r--r-- | pkg/varlinkapi/attach.go | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/pkg/varlinkapi/attach.go b/pkg/varlinkapi/attach.go index f292bbbf8..2234899a5 100644 --- a/pkg/varlinkapi/attach.go +++ b/pkg/varlinkapi/attach.go @@ -45,24 +45,22 @@ func (i *LibpodAPI) Attach(call iopodman.VarlinkCall, name string, detachKeys st var finalErr error resize := make(chan remotecommand.TerminalSize) errChan := make(chan error) - varlink := VarlinkCall{&call} - if err := varlink.RequiresUpgrade(); err != nil { - return varlink.ReplyErrorOccurred(err.Error()) + if !call.WantsUpgrade() { + return call.ReplyErrorOccurred("client must use upgraded connection to attach") } - ctr, err := i.Runtime.LookupContainer(name) if err != nil { - return varlink.ReplyErrorOccurred(err.Error()) + return call.ReplyErrorOccurred(err.Error()) } state, err := ctr.State() if err != nil { - return varlink.ReplyErrorOccurred(err.Error()) + return call.ReplyErrorOccurred(err.Error()) } if !start && state != libpod.ContainerStateRunning { - return varlink.ReplyErrorOccurred("container must be running to attach") + return call.ReplyErrorOccurred("container must be running to attach") } - + call.Reply(nil) reader, writer, _, pw, streams := setupStreams(call) go func() { @@ -83,7 +81,7 @@ func (i *LibpodAPI) Attach(call iopodman.VarlinkCall, name string, detachKeys st quitWriter := virtwriter.NewVirtWriteCloser(writer, virtwriter.Quit) _, err = quitWriter.Write([]byte("HANG-UP")) // TODO error handling is not quite right here yet - return varlink.Writer.Flush() + return call.Writer.Flush() } func attach(ctr *libpod.Container, streams *libpod.AttachStreams, detachKeys string, resize chan remotecommand.TerminalSize, errChan chan error) error { |