Fix output plugins blocking startup if remote is not reachable.

Resolves elastic#1213
urso · Apr 27, 2016 · a10a59e · a10a59e
1 parent 5bfba72
commit a10a59e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -48,6 +48,7 @@ https://github.com/elastic/beats/compare/v5.0.0-alpha1...master[Check the HEAD d
 - Fix bug affecting -cpuprofile, -memprofile, and -httpprof CLI flags {pull}1415[1415]
 - Fix race when multiple outputs access the same event with logstash output manipulating event {issue}1410[1410] {pull}1428[1428]
 - Seed random number generator using crypto.rand package. {pull}1503{1503]
+- Fix beats hanging in -configtest {issue}1213[1213]
 
 *Packetbeat*
 

diff --git a/libbeat/outputs/mode/single.go b/libbeat/outputs/mode/single.go
@@ -45,7 +45,6 @@ func NewSingleConnectionMode(
 		maxAttempts: maxAttempts,
 	}
 
-	_ = s.connect() // try to connect, but ignore errors for now
 	return s, nil
 }
 

diff --git a/libbeat/outputs/mode/single_test.go b/libbeat/outputs/mode/single_test.go
@@ -46,7 +46,7 @@ func testSingleConnectFailConnectAndSend(t *testing.T, events []eventInfo) {
 			&mockClient{
 				connected: false,
 				close:     closeOK,
-				connect:   failConnect(4, errFail), // 3 fails + 1 on create
+				connect:   failConnect(3, errFail), // 3 fails
 				publish:   collectPublish(&collected),
 			},
 		},
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,7 +45,6 @@ func NewSingleConnectionMode( @@
     		maxAttempts: maxAttempts,
     	}
-    	_ = s.connect() // try to connect, but ignore errors for now
     	return s, nil
     }
@@ Expand Down @@