InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #16228 from duglin/ContextualizeEvents"

Browse Source 
Although having a request ID available throughout the codebase is very
valuable, the impact of requiring a Context as an argument to every
function in the codepath of an API request, is too significant and was
not properly understood at the time of the review.

Furthermore, mixing API-layer code with non-API-layer code makes the
latter usable only by API-layer code (one that has a notion of Context).

This reverts commit de41640435, reversing
changes made to 7daeecd42d.

Signed-off-by: Tibor Vass <tibor@docker.com>

Conflicts:
	api/server/container.go
	builder/internals.go
	daemon/container_unix.go
	daemon/create.go
This commit is contained in:
Tibor Vass
2015-09-29 13:51:40 -04:00
parent 79c31f4b13
commit b08f071e18
68 changed files with 564 additions and 736 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
daemon/stop.go
View File

@@ -1,7 +1,6 @@
package daemon
import (
"github.com/docker/docker/context"
derr "github.com/docker/docker/errors"
)
@@ -11,15 +10,15 @@ import (
// will wait for a graceful termination. An error is returned if the
// container is not found, is already stopped, or if there is a
// problem stopping the container.
func (daemon *Daemon) ContainerStop(ctx context.Context, name string, seconds int) error {
container, err := daemon.Get(ctx, name)
func (daemon *Daemon) ContainerStop(name string, seconds int) error {
container, err := daemon.Get(name)
if err != nil {
return err
}
if !container.IsRunning() {
return derr.ErrorCodeStopped
}
if err := container.Stop(ctx, seconds); err != nil {
if err := container.Stop(seconds); err != nil {
return derr.ErrorCodeCantStop.WithArgs(name, err)
}
return nil