Fix panic in log harvester error handling

When the log harvester initialisation fails (i.e. due to wrong configuration), it causes a panic instead of reporting the error. Fixes elastic#6800
adriansr · Apr 9, 2018 · 3f830ed · 3f830ed
1 parent 1448c63
commit 3f830ed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -57,6 +57,8 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
 
 *Filebeat*
 
+- Fix panic when log prospector configuration fails to load. {issue}6800[6800]
+
 *Heartbeat*
 
 *Metricbeat*

diff --git a/filebeat/input/log/input.go b/filebeat/input/log/input.go
@@ -585,7 +585,9 @@ func (p *Input) createHarvester(state file.State, onTerminate func()) (*Harveste
 		},
 		outlet,
 	)
-	h.onTerminate = onTerminate
+	if err == nil {
+		h.onTerminate = onTerminate
+	}
 	return h, err
 }