diff options
author | Doug Davis <dug@us.ibm.com> | 2015-09-10 15:01:18 -0700 |
---|---|---|
committer | Doug Davis <dug@us.ibm.com> | 2015-09-24 11:56:37 -0700 |
commit | 26b1064967d9fcefd4c35f60e96bf6d7c9a3b5f8 (patch) | |
tree | 08e5c279b8f491a85f367f46ff129f97d9899abc /daemon/rename.go | |
parent | 23750fb80280e6770590b0ea30781c43f42e430d (diff) | |
download | docker-26b1064967d9fcefd4c35f60e96bf6d7c9a3b5f8.tar.gz |
Add context.RequestID to event stream
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>
Diffstat (limited to 'daemon/rename.go')
-rw-r--r-- | daemon/rename.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/daemon/rename.go b/daemon/rename.go index de80e609f1..7595881605 100644 --- a/daemon/rename.go +++ b/daemon/rename.go @@ -1,18 +1,19 @@ package daemon import ( + "github.com/docker/docker/context" derr "github.com/docker/docker/errors" ) // ContainerRename changes the name of a container, using the oldName // to find the container. An error is returned if newName is already // reserved. -func (daemon *Daemon) ContainerRename(oldName, newName string) error { +func (daemon *Daemon) ContainerRename(ctx context.Context, oldName, newName string) error { if oldName == "" || newName == "" { return derr.ErrorCodeEmptyRename } - container, err := daemon.Get(oldName) + container, err := daemon.Get(ctx, oldName) if err != nil { return err } @@ -21,7 +22,7 @@ func (daemon *Daemon) ContainerRename(oldName, newName string) error { container.Lock() defer container.Unlock() - if newName, err = daemon.reserveName(container.ID, newName); err != nil { + if newName, err = daemon.reserveName(ctx, container.ID, newName); err != nil { return derr.ErrorCodeRenameTaken.WithArgs(err) } @@ -29,7 +30,7 @@ func (daemon *Daemon) ContainerRename(oldName, newName string) error { undo := func() { container.Name = oldName - daemon.reserveName(container.ID, oldName) + daemon.reserveName(ctx, container.ID, oldName) daemon.containerGraphDB.Delete(newName) } @@ -43,6 +44,6 @@ func (daemon *Daemon) ContainerRename(oldName, newName string) error { return err } - container.logEvent("rename") + container.logEvent(ctx, "rename") return nil } |