Fix stall on non-batched outputs with batches

stevedh · Mar 26, 2021 · b68ddf4 · b68ddf4
1 parent abc05af
commit b68ddf4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+## 3.42.1 - 2021-03-26
+
+### Fixed
+
+- Fixed a potential pipeline stall that would occur when non-batched outputs receive message batches.
+
 ## 3.42.0 - 2021-02-22
 
 ### New

diff --git a/lib/output/not_batched.go b/lib/output/not_batched.go
@@ -160,14 +160,11 @@ func (n *notBatchedOutput) Connected() bool {
 
 func (n *notBatchedOutput) CloseAsync() {
 	n.close()
+	n.fullyClose()
 }
 
 // WaitForClose blocks until the File output has closed down.
 func (n *notBatchedOutput) WaitForClose(timeout time.Duration) error {
-	go func() {
-		<-time.After(timeout - time.Second)
-		n.fullyClose()
-	}()
 	select {
 	case <-n.closedChan:
 	case <-time.After(timeout):