Merge pull request #944 from urso/fix/ls-err-loop

Fix logstash output hanging on too many timeout errors
elastic · Feb 8, 2016 · f126018 · f126018
2 parents 08a6d2e + ee062e0
commit f126018
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ https://github.com/elastic/beats/compare/v1.1.0...master[Check the HEAD diff]
 ==== Bugfixes
 
 *Affecting all Beats*
+- Fix logstash output loop hanging in infinite loop on too many output errors.
 
 *Packetbeat*
 

diff --git a/libbeat/outputs/logstash/client.go b/libbeat/outputs/logstash/client.go
@@ -196,7 +196,8 @@ func (l *lumberjackClient) onFail(n int, err error) (int, error) {
 
 	// if we've seen 3 consecutive timeout errors, close connection
 	l.countTimeoutErr++
-	if l.countTimeoutErr == maxAllowedTimeoutErr {
+	if l.countTimeoutErr >= maxAllowedTimeoutErr {
+		l.countTimeoutErr = 0 // reset error counter and close connection
 		_ = l.Close()
 		return n, err
 	}