feat: Simplify signal handling using signal.NotifyContext (#103)

Simplify signal handling using signal.NotifyContext

Replace manual signal handling with signal.NotifyContext which automatically
cancels the context when SIGTERM or SIGINT is received. This simplifies the
code by removing the HandleSignals function and using context.Canceled for
error checking instead of string matching.

Author: LaurenceJJones

cmd/root.go

@@ -31,25 +31,6 @@ import (
 
 const name = "crowdsec-spoa-bouncer"
 
-func HandleSignals(ctx context.Context) error {
-	signalChan := make(chan os.Signal, 1)
-	signal.Notify(signalChan, syscall.SIGTERM, os.Interrupt)
-
-	select {
-	case s := <-signalChan:
-		switch s {
-		case syscall.SIGTERM:
-			return errors.New("received SIGTERM")
-		case os.Interrupt: // cross-platform SIGINT
-			return errors.New("received interrupt")
-		}
-	case <-ctx.Done():
-		return ctx.Err()
-	}
-
-	return nil
-}
-
 func Execute() error {
 	// Parent pflags
 	configPath := pflag.StringP("config", "c", "/etc/crowdsec/bouncers/crowdsec-spoa-bouncer.yaml", "path to crowdsec-spoa-bouncer.yaml")
@@ -106,7 +87,10 @@ func Execute() error {
 		return fmt.Errorf("unable to configure bouncer: %w", err)
 	}
 
-	g, ctx := errgroup.WithContext(context.Background())
+	ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
+	defer stop()
+
+	g, ctx := errgroup.WithContext(ctx)
 
 	config.Geo.Init(ctx)
 
@@ -119,10 +103,6 @@ func Execute() error {
 		log.Debugf("InsecureSkipVerify is set to %t", *bouncer.InsecureSkipVerify)
 	}
 
-	g.Go(func() error {
-		return HandleSignals(ctx)
-	})
-
 	g.Go(func() error {
 		err := bouncer.Run(ctx)
 		return fmt.Errorf("bouncer run halted: %w", err)
@@ -229,18 +209,9 @@ func Execute() error {
 	_ = csdaemon.Notify(csdaemon.Ready, log.StandardLogger())
 
 	err = g.Wait()
-
-	// Determine if this was an expected shutdown signal
-	isExpectedShutdown := false
-	if err != nil {
-		switch err.Error() {
-		case "received SIGTERM":
-			log.Info("Received SIGTERM, shutting down")
-			isExpectedShutdown = true
-		case "received interrupt":
-			log.Info("Received interrupt, shutting down")
-			isExpectedShutdown = true
-		}
+	if errors.Is(err, context.Canceled) {
+		log.Info("Context canceled, shutting down")
+		err = nil
 	}
 
 	// Shutdown SPOA server gracefully after all goroutines finish
@@ -252,10 +223,5 @@ func Execute() error {
 		log.Errorf("Failed to shutdown SPOA: %v", shutdownErr)
 	}
 
-	// Return error only if it was unexpected
-	if err != nil && !isExpectedShutdown {
-		return err
-	}
-
-	return nil
+	return err
 }