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

Merge pull request #17726 from runcom/fix-errors-format

Browse Source 
Fix errors format
Upstream-commit: b52bedbd480b5029656733a449bd3596b8561e5a
Component: engine
This commit is contained in:
David Calavera
2015-11-05 13:30:57 -08:00
parent bbe8f4c04c 1bdb88a97a
commit ce27d8b852
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/container_unix.go
+1 -1
View File
@@ -1081,7 +1081,7 @@ func (daemon *Daemon) setNetworkNamespaceKey(containerID string, pid int) error
search := libnetwork.SandboxContainerWalker(&sandbox, containerID)
daemon.netController.WalkSandboxes(search)
if sandbox == nil {
return derr.ErrorCodeNoSandbox.WithArgs(containerID)
return derr.ErrorCodeNoSandbox.WithArgs(containerID, "no sandbox found")
}
return sandbox.SetKey(path)
components/engine/daemon/monitor.go
+1 -1
View File
@@ -190,7 +190,7 @@ func (m *containerMonitor) Start() error {
m.container.ExitCode = -1
m.resetContainer(false)
return derr.ErrorCodeCantStart.WithArgs(utils.GetErrorMessage(err))
return derr.ErrorCodeCantStart.WithArgs(m.container.ID, utils.GetErrorMessage(err))
}
logrus.Errorf("Error running container: %s", err)