Browse Source

make ctx available for killing

Thibault bui Koechlin 5 years ago
parent
commit
907d490d97
1 changed files with 6 additions and 4 deletions
  1. 6 4
      cmd/crowdsec/main.go

+ 6 - 4
cmd/crowdsec/main.go

@@ -33,6 +33,8 @@ var (
 	buckets *leaky.Buckets
 	buckets *leaky.Buckets
 	cConfig *csconfig.CrowdSec
 	cConfig *csconfig.CrowdSec
 
 
+	OutputRunner *outputs.Output
+
 	/*settings*/
 	/*settings*/
 	lastProcessedItem time.Time /*keep track of last item timestamp in time-machine. it is used to GC buckets when we dump them.*/
 	lastProcessedItem time.Time /*keep track of last item timestamp in time-machine. it is used to GC buckets when we dump them.*/
 )
 )
@@ -224,7 +226,7 @@ func main() {
 		return
 		return
 	}
 	}
 
 
-	outputRunner, err := outputs.NewOutput(cConfig.OutputConfig, cConfig.Daemonize)
+	OutputRunner, err := outputs.NewOutput(cConfig.OutputConfig, cConfig.Daemonize)
 	if err != nil {
 	if err != nil {
 		log.Fatalf("output plugins initialization error : %s", err.Error())
 		log.Fatalf("output plugins initialization error : %s", err.Error())
 	}
 	}
@@ -236,7 +238,7 @@ func main() {
 			"path":    cConfig.ConfigFolder + "/api.yaml",
 			"path":    cConfig.ConfigFolder + "/api.yaml",
 			"profile": scenariosEnabled,
 			"profile": scenariosEnabled,
 		}
 		}
-		if err := outputRunner.InitAPI(apiConfig); err != nil {
+		if err := OutputRunner.InitAPI(apiConfig); err != nil {
 			log.Fatalf(err.Error())
 			log.Fatalf(err.Error())
 		}
 		}
 	}
 	}
@@ -282,7 +284,7 @@ func main() {
 
 
 	for i := 0; i < nbParser; i++ {
 	for i := 0; i < nbParser; i++ {
 		outputsTomb.Go(func() error {
 		outputsTomb.Go(func() error {
-			err := runOutput(inputEventChan, outputEventChan, holders, buckets, *postOverflowCTX, postOverflowNodes, outputProfiles, outputRunner)
+			err := runOutput(inputEventChan, outputEventChan, holders, buckets, *postOverflowCTX, postOverflowNodes, outputProfiles, OutputRunner)
 			if err != nil {
 			if err != nil {
 				log.Errorf("runPour error : %s", err)
 				log.Errorf("runPour error : %s", err)
 				return err
 				return err
@@ -301,7 +303,7 @@ func main() {
 	//start reading in the background
 	//start reading in the background
 	acquisition.AcquisStartReading(acquisitionCTX, inputLineChan, &acquisTomb)
 	acquisition.AcquisStartReading(acquisitionCTX, inputLineChan, &acquisTomb)
 
 
-	if err = serve(*outputRunner); err != nil {
+	if err = serve(*OutputRunner); err != nil {
 		log.Fatalf(err.Error())
 		log.Fatalf(err.Error())
 	}
 	}