mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
26b1064967
This PR adds a "request ID" to each event generated, the 'docker events' stream now looks like this: ``` 2015-09-10T15:02:50.000000000-07:00 [reqid: c01e3534ddca] de7c5d4ca927253cf4e978ee9c4545161e406e9b5a14617efb52c658b249174a: (from ubuntu) create ``` Note the `[reqID: c01e3534ddca]` part, that's new. Each HTTP request will generate its own unique ID. So, if you do a `docker build` you'll see a series of events all with the same reqID. This allow for log processing tools to determine which events are all related to the same http request. I didn't propigate the context to all possible funcs in the daemon, I decided to just do the ones that needed it in order to get the reqID into the events. I'd like to have people review this direction first, and if we're ok with it then I'll make sure we're consistent about when we pass around the context - IOW, make sure that all funcs at the same level have a context passed in even if they don't call the log funcs - this will ensure we're consistent w/o passing it around for all calls unnecessarily. ping @icecrime @calavera @crosbymichael Signed-off-by: Doug Davis <dug@us.ibm.com>
26 lines
828 B
Go
26 lines
828 B
Go
package daemon
|
|
|
|
import (
|
|
"github.com/docker/docker/context"
|
|
derr "github.com/docker/docker/errors"
|
|
)
|
|
|
|
// ContainerStop looks for the given container and terminates it,
|
|
// waiting the given number of seconds before forcefully killing the
|
|
// container. If a negative number of seconds is given, ContainerStop
|
|
// 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)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if !container.IsRunning() {
|
|
return derr.ErrorCodeStopped
|
|
}
|
|
if err := container.Stop(ctx, seconds); err != nil {
|
|
return derr.ErrorCodeCantStop.WithArgs(name, err)
|
|
}
|
|
return nil
|
|
}
|