docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16148 from Microsoft/10662-fixlogging 

Windows: Fix logging
This commit is contained in:
David Calavera 2015-09-08 14:28:28 -07:00
parent fd32c47112 1d52c53eea
commit 5c22cb5741
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/execdriver/windows/terminatekill.go
View File

@ -26,7 +26,7 @@ func kill(id string, pid int) error {
// Terminate Process // Terminate Process
if err = hcsshim.TerminateProcessInComputeSystem(id, uint32(pid)); err != nil { if err = hcsshim.TerminateProcessInComputeSystem(id, uint32(pid)); err != nil {
logrus.Warnf("Failed to terminate pid %d in %s", id, pid, err) logrus.Warnf("Failed to terminate pid %d in %s: %q", pid, id, err)
// Ignore errors // Ignore errors
err = nil err = nil
} }
@ -34,13 +34,13 @@ func kill(id string, pid int) error {
if terminateMode { if terminateMode {
// Terminate the compute system // Terminate the compute system
if err = hcsshim.TerminateComputeSystem(id); err != nil { if err = hcsshim.TerminateComputeSystem(id); err != nil {
logrus.Errorf("Failed to terminate %s - %s", id, err) logrus.Errorf("Failed to terminate %s - %q", id, err)
} }
} else { } else {
// Shutdown the compute system // Shutdown the compute system
if err = hcsshim.ShutdownComputeSystem(id); err != nil { if err = hcsshim.ShutdownComputeSystem(id); err != nil {
logrus.Errorf("Failed to shutdown %s - %s", id, err) logrus.Errorf("Failed to shutdown %s - %q", id, err)
} }
} }
return err return err