lint revive(deep-exit): refactor cmd/crowdsec

.golangci.yml

@@ -497,6 +497,10 @@ issues:
         - revive
       path: pkg/metabase/metabase.go
 
+    - linters:
+        - revive
+      path: pkg/metabase/container.go
+
     - linters:
         - revive
       path: cmd/crowdsec-cli/copyfile.go

cmd/crowdsec/crowdsec.go

@@ -4,12 +4,10 @@
 	"context"
 	"fmt"
 	"os"
-	"path/filepath"
 	"sync"
 	"time"
 
 	log "github.com/sirupsen/logrus"
-	"gopkg.in/yaml.v3"
 
 	"github.com/crowdsecurity/go-cs-lib/trace"
 
@@ -79,7 +77,6 @@
 
 				if err := runParse(inputLineChan, inputEventChan, *parsers.Ctx, parsers.Nodes); err != nil {
 					// this error will never happen as parser.Parse is not able to return errors
-					log.Fatalf("starting parse error : %s", err)
 					return err
 				}
 
@@ -109,12 +106,7 @@
 			bucketsTomb.Go(func() error {
 				defer trace.CatchPanic("crowdsec/runPour")
 
-				if err := runPour(inputEventChan, holders, buckets, cConfig); err != nil {
-					log.Fatalf("starting pour error : %s", err)
-					return err
-				}
-
-				return nil
+				return runPour(inputEventChan, holders, buckets, cConfig)
 			})
 		}
 		bucketWg.Done()
@@ -140,12 +132,7 @@
 			outputsTomb.Go(func() error {
 				defer trace.CatchPanic("crowdsec/runOutput")
 
-				if err := runOutput(inputEventChan, outputEventChan, buckets, *parsers.Povfwctx, parsers.Povfwnodes, apiClient); err != nil {
-					log.Fatalf("starting outputs error : %s", err)
-					return err
-				}
-
-				return nil
+				return runOutput(inputEventChan, outputEventChan, buckets, *parsers.Povfwctx, parsers.Povfwnodes, apiClient)
 			})
 		}
 		outputWg.Done()
@@ -198,91 +185,22 @@
 		log.Debugf("Shutting down crowdsec routines")
 
 		if err := ShutdownCrowdsecRoutines(); err != nil {
-			log.Fatalf("unable to shutdown crowdsec routines: %s", err)
+			return fmt.Errorf("unable to shutdown crowdsec routines: %w", err)
 		}
 
 		log.Debugf("everything is dead, return crowdsecTomb")
 
 		if dumpStates {
-			dumpParserState()
-			dumpOverflowState()
-			dumpBucketsPour()
+			if err := dumpAllStates(); err != nil {
+				log.Fatal(err)
+			}
 			os.Exit(0)
 		}
 
 		return nil
 	})
 }
 
-func dumpBucketsPour() {
-	fd, err := os.OpenFile(filepath.Join(parser.DumpFolder, "bucketpour-dump.yaml"), os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0o666)
-	if err != nil {
-		log.Fatalf("open: %s", err)
-	}
-
-	out, err := yaml.Marshal(leaky.BucketPourCache)
-	if err != nil {
-		log.Fatalf("marshal: %s", err)
-	}
-
-	b, err := fd.Write(out)
-	if err != nil {
-		log.Fatalf("write: %s", err)
-	}
-
-	log.Tracef("wrote %d bytes", b)
-
-	if err := fd.Close(); err != nil {
-		log.Fatalf(" close: %s", err)
-	}
-}
-
-func dumpParserState() {
-	fd, err := os.OpenFile(filepath.Join(parser.DumpFolder, "parser-dump.yaml"), os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0o666)
-	if err != nil {
-		log.Fatalf("open: %s", err)
-	}
-
-	out, err := yaml.Marshal(parser.StageParseCache)
-	if err != nil {
-		log.Fatalf("marshal: %s", err)
-	}
-
-	b, err := fd.Write(out)
-	if err != nil {
-		log.Fatalf("write: %s", err)
-	}
-
-	log.Tracef("wrote %d bytes", b)
-
-	if err := fd.Close(); err != nil {
-		log.Fatalf(" close: %s", err)
-	}
-}
-
-func dumpOverflowState() {
-	fd, err := os.OpenFile(filepath.Join(parser.DumpFolder, "bucket-dump.yaml"), os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0o666)
-	if err != nil {
-		log.Fatalf("open: %s", err)
-	}
-
-	out, err := yaml.Marshal(bucketOverflows)
-	if err != nil {
-		log.Fatalf("marshal: %s", err)
-	}
-
-	b, err := fd.Write(out)
-	if err != nil {
-		log.Fatalf("write: %s", err)
-	}
-
-	log.Tracef("wrote %d bytes", b)
-
-	if err := fd.Close(); err != nil {
-		log.Fatalf(" close: %s", err)
-	}
-}
-
 func waitOnTomb() {
 	for {
 		select {

cmd/crowdsec/dump.go

@@ -0,0 +1,57 @@
+package main
+
+import (
+	"fmt"
+	"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)
+
+	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(
+		filepath.Join(parser.DumpFolder, "bucket-dump.yaml"),
+		bucketOverflows,
+	); err != nil {
+		return fmt.Errorf("while 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)
+	}
+
+	return nil
+}
+
+func dumpState(destPath string, obj any) error {
+	dir := filepath.Dir(destPath)
+
+	err := os.MkdirAll(dir, 0o755)
+	if err != nil {
+		return err
+	}
+
+	out, err := yaml.Marshal(obj)
+	if err != nil {
+		return err
+	}
+
+	return os.WriteFile(destPath, out, 0o666)
+}

cmd/crowdsec/serve.go

@@ -390,7 +390,7 @@ func Serve(cConfig *csconfig.Config, agentReady chan bool) error {
 	if flags.TestMode {
 		log.Infof("Configuration test done")
 		pluginBroker.Kill()
-		os.Exit(0)
+		return nil
 	}
 
 	if cConfig.Common != nil && cConfig.Common.Daemonize {