clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-08-21 05:07:22 +00:00
Code Issues Packages Projects Releases Wiki 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
parent 99b36c2c32 0f7a4534c1
commit 57dfca052b
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
container.go
+8
View File
@@ -256,6 +256,14 @@ func (container *Container) Start() error {
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
if container.Config.Tty {
container.cmd.Env = append(
runtime.go
+1 -8
View File
@@ -140,13 +140,6 @@ func (runtime *Runtime) Register(container *Container) error {
} else {
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
runtime.containers.PushBack(container)
return nil
@@ -157,7 +150,7 @@ func (runtime *Runtime) LogToDisk(src *writeBroadcaster, dst string) error {
if err != nil {
return err
}
src.AddWriter(NopWriteCloser(log))
src.AddWriter(log)
return nil
}