toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fix logging formatting
Upstream-commit: e2133b42ffc76d86809048cd87de50ad1b7f082d
Component: engine
This commit is contained in:
Vincent Demeester
2016-10-26 16:49:05 +02:00
committed by GitHub
parent 51365aea85 b4087aee32
commit 25fe293d44
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/container/container.go
View File

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

2
components/engine/libcontainerd/container_linux.go
View File

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