diff options
| author | Peter Hunt <pehunt@redhat.com> | 2019-07-23 13:46:03 -0400 |
|---|---|---|
| committer | Peter Hunt <pehunt@redhat.com> | 2019-07-23 16:49:04 -0400 |
| commit | 82dce36fb6ef3839c029b7450a75c85cf28cf377 (patch) | |
| tree | 15ec26b274bd16f1c88f3887d738057a021ce1b5 | |
| parent | d59f083637f267b3653bc7cda46fd729dcf35c17 (diff) | |
| download | podman-82dce36fb6ef3839c029b7450a75c85cf28cf377.tar.gz podman-82dce36fb6ef3839c029b7450a75c85cf28cf377.tar.bz2 podman-82dce36fb6ef3839c029b7450a75c85cf28cf377.zip | |
remove debug prints
Signed-off-by: Peter Hunt <pehunt@redhat.com>
| -rw-r--r-- | pkg/adapter/containers_remote.go | 1 | ||||
| -rw-r--r-- | pkg/varlinkapi/virtwriter/virtwriter.go | 11 |
2 files changed, 5 insertions, 7 deletions
diff --git a/pkg/adapter/containers_remote.go b/pkg/adapter/containers_remote.go index b7390c113..5a26f537f 100644 --- a/pkg/adapter/containers_remote.go +++ b/pkg/adapter/containers_remote.go @@ -735,7 +735,6 @@ func (r *LocalRuntime) attach(ctx context.Context, stdin, stdout *os.File, cid s term.SetRawTerminal(os.Stdin.Fd()) } - // TODO add detach keys support reply, err := iopodman.Attach().Send(r.Conn, varlink.Upgrade, cid, detachKeys, start) if err != nil { restoreTerminal(oldTermState) diff --git a/pkg/varlinkapi/virtwriter/virtwriter.go b/pkg/varlinkapi/virtwriter/virtwriter.go index bde3107df..27ecd1f52 100644 --- a/pkg/varlinkapi/virtwriter/virtwriter.go +++ b/pkg/varlinkapi/virtwriter/virtwriter.go @@ -113,7 +113,7 @@ func Reader(r *bufio.Reader, output, errput, input io.Writer, resize chan remote if output != nil { _, err := io.CopyN(output, r, messageSize) if err != nil { - return errors.Wrapf(err, "issue stdout") + return err } } case ToStderr: @@ -121,14 +121,13 @@ func Reader(r *bufio.Reader, output, errput, input io.Writer, resize chan remote _, err := io.CopyN(errput, r, messageSize) if err != nil { return err - return errors.Wrapf(err, "issue stderr") } } case ToStdin: if input != nil { _, err := io.CopyN(input, r, messageSize) if err != nil { - return errors.Wrapf(err, "issue stdin") + return err } } case TerminalResize: @@ -138,13 +137,13 @@ func Reader(r *bufio.Reader, output, errput, input io.Writer, resize chan remote _, err = io.ReadFull(r, out) if err != nil { - return errors.Wrapf(err, "issue resizing") + return err } } // Resize events come over in bytes, need to be reserialized resizeEvent := remotecommand.TerminalSize{} if err := json.Unmarshal(out, &resizeEvent); err != nil { - return errors.Wrapf(err, "issue resizing") + return err } resize <- resizeEvent } @@ -154,7 +153,7 @@ func Reader(r *bufio.Reader, output, errput, input io.Writer, resize chan remote _, err = io.ReadFull(r, out) if err != nil { - return errors.Wrapf(err, "issue quitting") + return err } } if execEcChan != nil { |