GitList

Browse code

Fix logs -f hanging on stopped containers

Fixes #7020

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>

Alexandr Morozov authored on 2014/08/19 21:04:02
Showing 1 changed files

daemon/logs.go index 386d9c6..c9c2ab8 100644

@@ -111,7 +111,7 @@ func (daemon *Daemon) ContainerLogs(job *engine.Job) engine.Status {
 			}
 		}
 	}
-	if follow {
+	if follow && container.State.IsRunning() {
 		errors := make(chan error, 2)
 		if stdout {
 			stdoutPipe := container.StdoutLogPipe()

...	...	@@ -111,7 +111,7 @@ func (daemon Daemon) ContainerLogs(job engine.Job) engine.Status {
111	111	}
112	112	}
113	113	}
114		- if follow {
	114	+ if follow && container.State.IsRunning() {
115	115	errors := make(chan error, 2)
116	116	if stdout {
117	117	stdoutPipe := container.StdoutLogPipe()