瀏覽代碼

Merge pull request #27763 from tonistiigi/fix-logging-formatting

Fix logging formatting
Vincent Demeester 8 年之前
父節點
當前提交
e2133b42ff
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      container/container.go
  2. 1 1
      libcontainerd/container_linux.go

+ 1 - 1
container/container.go

@@ -1049,7 +1049,7 @@ func (container *Container) InitializeStdio(iop libcontainerd.IOPipe) error {
 	if container.Stdin() == nil && !container.Config.Tty {
 	if container.Stdin() == nil && !container.Config.Tty {
 		if iop.Stdin != nil {
 		if iop.Stdin != nil {
 			if err := iop.Stdin.Close(); err != nil {
 			if err := iop.Stdin.Close(); err != nil {
-				logrus.Error("error closing stdin: %+v", err)
+				logrus.Warnf("error closing stdin: %+v", err)
 			}
 			}
 		}
 		}
 	}
 	}

+ 1 - 1
libcontainerd/container_linux.go

@@ -117,7 +117,7 @@ func (ctr *container) start(checkpoint string, checkpointDir string, attachStdio
 				select {
 				select {
 				case <-ready:
 				case <-ready:
 					if err := ctr.sendCloseStdin(); err != nil {
 					if err := ctr.sendCloseStdin(); err != nil {
-						logrus.Warnf("failed to close stdin: %+v")
+						logrus.Warnf("failed to close stdin: %+v", err)
 					}
 					}
 				case <-ctx.Done():
 				case <-ctx.Done():
 				}
 				}