Merge pull request #645 from ruflin/remove-filebeat-exit

Remove exits from filebeat

CHANGELOG.asciidoc

@@ -35,6 +35,7 @@ https://github.com/elastic/beats/compare/1.0.0...master[Check the HEAD diff]
 
 *Filebeat*
 - Add exclude_files configuration option {pull}563[563]
+- Stop filebeat if filebeat is started without any prospectors defined {pull}644[644]
 
 *Winlogbeat*
 

filebeat/beat/filebeat.go

@@ -2,7 +2,6 @@ package beat
 
 import (
 	"fmt"
-	"os"
 
 	"github.com/elastic/beats/libbeat/beat"
 	"github.com/elastic/beats/libbeat/cfgfile"
@@ -50,16 +49,6 @@ func (fb *Filebeat) Setup(b *beat.Beat) error {
 
 func (fb *Filebeat) Run(b *beat.Beat) error {
 
-	defer func() {
-		p := recover()
-		if p == nil {
-			return
-		}
-
-		fmt.Printf("recovered panic: %v", p)
-		os.Exit(1)
-	}()
-
 	var err error
 
 	// Init channels

filebeat/crawler/crawler.go

@@ -2,7 +2,6 @@ package crawler
 
 import (
 	"fmt"
-	"os"
 
 	"github.com/elastic/beats/filebeat/config"
 	"github.com/elastic/beats/filebeat/input"
@@ -48,9 +47,7 @@ func (crawler *Crawler) Start(prospectorConfigs []config.ProspectorConfig, event
 
 		err := prospector.Init()
 		if err != nil {
-			logp.Critical("Error in initing prospector: %s", err)
-			fmt.Printf("Error in initing prospector: %s", err)
-			os.Exit(1)
+			return fmt.Errorf("Error in initing prospector: %s", err)
 		}
 
 		go prospector.Run(eventChan)

libbeat/beat/beat.go

@@ -180,7 +180,7 @@ func (b *Beat) Run() {
 	// Run beater specific stuff
 	err = b.BT.Run(b)
 	if err != nil {
-		logp.Critical("Run returned an error: %v", err)
+		logp.Critical("Running the beat returned an error: %v", err)
 	}
 
 	service.Cleanup()