refactor(cmd/root): drop custom signal handling for the root cmd

Signed-off-by: Aldo Lacuku <[email protected]>

Author: alacuku

cmd/root.go

@@ -16,14 +16,13 @@ package cmd
 
 import (
 	"context"
-	"os"
 	"os/signal"
 	"syscall"
 
-	logger "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
 	"github.com/falcosecurity/falcoctl/pkg/options"
+	"github.com/falcosecurity/falcoctl/pkg/output"
 	"github.com/falcosecurity/falcoctl/pkg/version"
 )
 
@@ -32,14 +31,6 @@ const (
 	defaultRepoFile = "sources.yaml"
 )
 
-func init() {
-	logger.SetFormatter(&logger.TextFormatter{
-		ForceColors:            true,
-		DisableLevelTruncation: false,
-		DisableTimestamp:       true,
-	})
-}
-
 // New instantiates the root command.
 func New() *cobra.Command {
 	opt := options.NewOptions()
@@ -53,9 +44,6 @@ func New() *cobra.Command {
 			// by calling the initialize function.
 			opt.Initialize()
 		},
-		Run: func(c *cobra.Command, args []string) {
-			c.Help()
-		},
 	}
 
 	// Global flags
@@ -74,42 +62,15 @@ func New() *cobra.Command {
 
 // Execute creates the root command and runs it.
 func Execute() {
-	ctx := WithSignals(context.Background())
-	if err := New().ExecuteContext(ctx); err != nil {
-		logger.WithError(err).Fatal("error executing falcoctl")
-	}
-}
-
-// WithSignals returns a copy of ctx with a new Done channel.
-// The returned context's Done channel is closed when a SIGKILL or SIGTERM signal is received.
-func WithSignals(ctx context.Context) context.Context {
-	sigCh := make(chan os.Signal, 1)
-	signal.Notify(sigCh, os.Interrupt, syscall.SIGTERM)
+	ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGKILL)
 
-	ctx, cancel := context.WithCancel(ctx)
+	// If the ctx is marked as done then we reset the signals.
 	go func() {
-		defer cancel()
-		select {
-		case <-ctx.Done():
-			return
-		case s := <-sigCh:
-			switch s {
-			case os.Interrupt:
-				logger.Infof("received SIGINT")
-			case syscall.SIGTERM:
-				logger.Infof("received SIGTERM")
-			}
-			return
-		}
+		<-ctx.Done()
+		stop()
 	}()
-	return ctx
-}
 
-// initLogger configures the logger
-func initLogger(logLevel string) {
-	lvl, err := logger.ParseLevel(logLevel)
-	if err != nil {
-		logger.Fatal(err)
-	}
-	logger.SetLevel(lvl)
+	// we do not log the error here since we expect that each subcommand
+	// handles the errors by itself.
+	output.ExitOnErr(New().ExecuteContext(ctx))
 }

cmd/testdata/help.txt

@@ -1,7 +1,6 @@
 The control tool for running Falco in Kubernetes
 
 Usage:
-  falcoctl [flags]
   falcoctl [command]
 
 Available Commands:

cmd/testdata/noargsnoflags.txt

@@ -1,7 +1,6 @@
 The control tool for running Falco in Kubernetes
 
 Usage:
-  falcoctl [flags]
   falcoctl [command]
 
 Available Commands:

cmd/testdata/wrongflag.txt

@@ -1,6 +1,5 @@
 Error: unknown flag: --wrong
 Usage:
-  falcoctl [flags]
   falcoctl [command]
 
 Available Commands: