kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #266 from dotcloud/do_not_log_stopped_container

Browse source 
Do not log non-running containers
This commit is contained in:
Solomon Hykes 2013-03-29 21:29:19 -07:00
commit 57dfca052b
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
container.go
View file

@ -256,6 +256,14 @@ func (container *Container) Start() error {
container.Config.Env..., container.Config.Env...,
) )
// Setup logging of stdout and stderr to disk
if err := container.runtime.LogToDisk(container.stdout, container.logPath("stdout")); err != nil {
return err
}
if err := container.runtime.LogToDisk(container.stderr, container.logPath("stderr")); err != nil {
return err
}
var err error var err error
if container.Config.Tty { if container.Config.Tty {
container.cmd.Env = append( container.cmd.Env = append(

9
runtime.go
View file

@ -140,13 +140,6 @@ func (runtime *Runtime) Register(container *Container) error {
} else { } else {
container.stdinPipe = NopWriteCloser(ioutil.Discard) // Silently drop stdin container.stdinPipe = NopWriteCloser(ioutil.Discard) // Silently drop stdin
} }
// Setup logging of stdout and stderr to disk
if err := runtime.LogToDisk(container.stdout, container.logPath("stdout")); err != nil {
return err
}
if err := runtime.LogToDisk(container.stderr, container.logPath("stderr")); err != nil {
return err
}
// done // done
runtime.containers.PushBack(container) runtime.containers.PushBack(container)
return nil return nil
@ -157,7 +150,7 @@ func (runtime *Runtime) LogToDisk(src *writeBroadcaster, dst string) error {
if err != nil { if err != nil {
return err return err
} }
src.AddWriter(NopWriteCloser(log)) src.AddWriter(log)
return nil return nil
} }