docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9020 from daehyeok/log_exec 

Add exec event log
This commit is contained in:
Alexander Morozov 2015-01-03 10:40:00 -08:00
parent b2ab733c99 fc7f055096
commit 7eb5262d1b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/exec.go
View File

@ -154,6 +154,8 @@ func (d *Daemon) ContainerExecCreate(job *engine.Job) engine.Status {
Running: false, Running: false,
} }
container.LogEvent("exec_create: " + execConfig.ProcessConfig.Entrypoint + " " + strings.Join(execConfig.ProcessConfig.Arguments, " "))
d.registerExecCommand(execConfig) d.registerExecCommand(execConfig)
job.Printf("%s\n", execConfig.ID) job.Printf("%s\n", execConfig.ID)
@ -192,6 +194,8 @@ func (d *Daemon) ContainerExecStart(job *engine.Job) engine.Status {
log.Debugf("starting exec command %s in container %s", execConfig.ID, execConfig.Container.ID) log.Debugf("starting exec command %s in container %s", execConfig.ID, execConfig.Container.ID)
container := execConfig.Container container := execConfig.Container
container.LogEvent("exec_start: " + execConfig.ProcessConfig.Entrypoint + " " + strings.Join(execConfig.ProcessConfig.Arguments, " "))
if execConfig.OpenStdin { if execConfig.OpenStdin {
r, w := io.Pipe() r, w := io.Pipe()
go func() { go func() {

2
docs/sources/reference/api/docker_remote_api_v1.17.md
View File

@ -1380,7 +1380,7 @@ polling (using since).
Docker containers will report the following events: Docker containers will report the following events:
create, destroy, die, export, kill, oom, pause, restart, start, stop, unpause create, destroy, die, exec_create, exec_start, export, kill, oom, pause, restart, start, stop, unpause
and Docker images will report: and Docker images will report: