use cmd.String() when logging binary_io command

additionally clean up potential linter errors Signed-off-by: Maksim An <[email protected]>
microsoft · Mar 19, 2021 · e869ce2 · e869ce2
1 parent 885f896
commit e869ce2
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/internal/cmd/io_binary.go b/internal/cmd/io_binary.go
@@ -61,7 +61,12 @@ func NewBinaryIO(ctx context.Context, id string, uri *url.URL) (_ UpstreamIO, er
 	if err != nil {
 		return nil, err
 	}
-	defer waitPipe.Close()
+	defer func() {
+		err := waitPipe.Close()
+		if err != nil {
+			log.G(ctx).Errorf("error closing wait pipe: %s", waitPipePath)
+		}
+	}()
 
 	envs := []string{
 		"CONTAINER_ID=" + id,
@@ -102,7 +107,7 @@ func NewBinaryIO(ctx context.Context, id string, uri *url.URL) (_ UpstreamIO, er
 	log.G(ctx).WithFields(logrus.Fields{
 		"containerID":        id,
 		"containerNamespace": ns,
-		"binaryCmd":          cmd,
+		"binaryCmd":          cmd.String(),
 		"binaryProcessID":    cmd.Process.Pid,
 	}).Debug("binary io process started")
 
@@ -198,7 +203,7 @@ func (b *binaryIO) Close(ctx context.Context) {
 	})
 }
 
-func (b *binaryIO) CloseStdin(ctx context.Context) {}
+func (b *binaryIO) CloseStdin(_ context.Context) {}
 
 func (b *binaryIO) Stdin() io.Reader {
 	return nil
@@ -273,7 +278,7 @@ func (p *pipe) Read(b []byte) (int, error) {
 }
 
 func (p *pipe) Close() error {
-	p.l.Close()
+	_ = p.l.Close()
 	p.conWg.Wait()
 	if p.con != nil {
 		return p.con.Close()