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

Merge pull request #27839 from vdemeester/lets-clise-this

Browse Source 
Small log formatting fixes
Upstream-commit: 5945ba64b28a371d9f82232890c8b92e8355971d
Component: engine
This commit is contained in:
Vincent Demeester
2016-10-28 05:20:24 +02:00
committed by GitHub
parent 5c99e2a951 eac48da2d6
commit e39e12ad3b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/daemon/exec/exec.go
View File

@ -49,7 +49,7 @@ func (c *Config) InitializeStdio(iop libcontainerd.IOPipe) error {
if c.Stdin() == nil && !c.Tty && runtime.GOOS == "windows" {
if iop.Stdin != nil {
if err := iop.Stdin.Close(); err != nil {
logrus.Error("error closing exec stdin: %+v", err)
logrus.Errorf("error closing exec stdin: %+v", err)
}
}
}

2
components/engine/runconfig/streams.go
View File

@ -135,7 +135,7 @@ func (streamConfig *StreamConfig) CopyToPipe(iop libcontainerd.IOPipe) {
go func() {
pools.Copy(iop.Stdin, stdin)
if err := iop.Stdin.Close(); err != nil {
logrus.Error("failed to clise stdin: %+v", err)
logrus.Errorf("failed to close stdin: %+v", err)
}
}()
}