Merge pull request deis#4291 from krancour/fix-logspout-deadlock

fix(logspout): fix deadlock when attaching
iamstoick · Aug 19, 2015 · bd5f008 · bd5f008
2 parents a08d433 + 06f301f
commit bd5f008
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/logspout/attacher.go b/logspout/attacher.go
@@ -122,7 +122,11 @@ func (m *AttachManager) Listen(source *Source, logstream chan *Log, closer <-cha
 	if source == nil {
 		source = new(Source)
 	}
-	events := make(chan *AttachEvent)
+	depth := len(m.attached)
+	if depth == 0 {
+		depth = 1
+	}
+	events := make(chan *AttachEvent, depth)
 	m.addListener(events)
 	defer m.removeListener(events)
 	for {