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

Revert "Add VarlinkCall.RequiresUpgrade() type and method"

Browse Source 
This reverts commit bd3154fcf6a48b37cfde5d9b1226900cd863c0d9.

Commit in question may be breaking upstream CI.

Signed-off-by: Matthew Heon <mheon@redhat.com>
This commit is contained in:
Matthew Heon
2019-05-16 14:35:49 -04:00
parent 8161802f7d
commit 601fc2ce4f
4 changed files with 23 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/varlinkapi/attach.go
View File

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