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

Merge pull request #16148 from Microsoft/10662-fixlogging

Browse Source 
Windows: Fix logging
Upstream-commit: 5c22cb5741fc3897734ef375150a8e9a4925cb06
Component: engine
This commit is contained in:
David Calavera
2015-09-08 14:28:28 -07:00
parent 74847cecc0 364794e2fe
commit da721c9eef
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/execdriver/windows/terminatekill.go
+3 -3
View File
@@ -26,7 +26,7 @@ func kill(id string, pid int) error {
// Terminate Process
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
err = nil
}
@@ -34,13 +34,13 @@ func kill(id string, pid int) error {
if terminateMode {
// Terminate the compute system
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 {
// Shutdown the compute system
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