refact dump.go

Author: mmetc

cmd/crowdsec/crowdsec.go

@@ -228,7 +228,9 @@ func serveCrowdsec(ctx context.Context, parsers *parser.Parsers, cConfig *csconf
 		log.Debugf("everything is dead, return crowdsecTomb")
 
 		if dumpStates {
-			if err := dumpAllStates(); err != nil {
+			log.Debugf("Dumping parser+bucket states to %s", dumpFolder)
+
+			if err := dumpAllStates(dumpFolder); err != nil {
 				log.Fatal(err)
 			}
 

cmd/crowdsec/dump.go

@@ -5,52 +5,38 @@ import (
 	"os"
 	"path/filepath"
 
-	log "github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v3"
 
 	leaky "github.com/crowdsecurity/crowdsec/pkg/leakybucket"
 	"github.com/crowdsecurity/crowdsec/pkg/parser"
 )
 
-func dumpAllStates() error {
-	log.Debugf("Dumping parser+bucket states to %s", parser.DumpFolder)
+func dumpAllStates(dir string) error {
+	err := os.MkdirAll(dir, 0o755)
+	if err != nil {
+		return err
+	}
 
-	if err := dumpState(
-		filepath.Join(parser.DumpFolder, "parser-dump.yaml"),
-		parser.StageParseCache,
-	); err != nil {
-		return fmt.Errorf("while dumping parser state: %w", err)
+	if err := dumpState(dir, "parser-dump.yaml", parser.StageParseCache); err != nil {
+		return fmt.Errorf("dumping parser state: %w", err)
 	}
 
-	if err := dumpState(
-		filepath.Join(parser.DumpFolder, "bucket-dump.yaml"),
-		bucketOverflows,
-	); err != nil {
-		return fmt.Errorf("while dumping bucket overflow state: %w", err)
+	if err := dumpState(dir, "bucket-dump.yaml", bucketOverflows); err != nil {
+		return fmt.Errorf("dumping bucket overflow state: %w", err)
 	}
 
-	if err := dumpState(
-		filepath.Join(parser.DumpFolder, "bucketpour-dump.yaml"),
-		leaky.BucketPourCache,
-	); err != nil {
-		return fmt.Errorf("while dumping bucket pour state: %w", err)
+	if err := dumpState(dir, "bucketpour-dump.yaml", leaky.BucketPourCache); err != nil {
+		return fmt.Errorf("dumping bucket pour state: %w", err)
 	}
 
 	return nil
 }
 
-func dumpState(destPath string, obj any) error {
-	dir := filepath.Dir(destPath)
-
-	err := os.MkdirAll(dir, 0o755)
-	if err != nil {
-		return err
-	}
-
+func dumpState(dir, name string, obj any) error {
 	out, err := yaml.Marshal(obj)
 	if err != nil {
 		return err
 	}
 
-	return os.WriteFile(destPath, out, 0o666)
+	return os.WriteFile(filepath.Join(dir, name), out, 0o666)
 }

cmd/crowdsec/main.go

@@ -129,7 +129,6 @@ func LoadConfig(configFile string, disableAgent bool, disableAPI bool, quiet boo
 
 	if dumpFolder != "" {
 		parser.ParseDump = true
-		parser.DumpFolder = dumpFolder
 		leakybucket.BucketPourTrack = true
 		dumpStates = true
 	}

pkg/parser/runtime.go

@@ -242,10 +242,7 @@ func stageidx(stage string, stages []string) int {
 	return -1
 }
 
-var (
-	ParseDump  bool
-	DumpFolder string
-)
+var ParseDump  bool
 
 var (
 	StageParseCache dumps.ParserResults = make(dumps.ParserResults)