OS signal handler will exit on context cancellation

Author: geoff-vball

relayer/main/main.go

@@ -361,20 +361,19 @@ func main() {
 	}
 
 	// Handle os signal
-	errGroup.Go(func() error {
+	go func() {
 		sigChan := make(chan os.Signal, 1)
 		signal.Notify(sigChan, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)
 
-		sig := <-sigChan
-		logger.Info("Receive os signal", zap.Stringer("signal", sig))
-
-		// Cancel the parent context
-		// This will cascade to errgroup context
-		cancel()
-
-		// No error for graceful shutdown
-		return nil
-	})
+		select {
+		case sig := <-sigChan:
+			logger.Info("Received os signal", zap.Stringer("signal", sig))
+			// Cancel the parent context
+			// This will cascade to errgroup context
+			cancel()
+		case <-ctx.Done():
+		}
+	}()
 
 	logger.Info("Initialization complete")
 	if err := errGroup.Wait(); err != nil {

signature-aggregator/main/main.go

@@ -203,20 +203,19 @@ func main() {
 	})
 
 	// Handle os signal
-	errGroup.Go(func() error {
+	go func() {
 		sigChan := make(chan os.Signal, 1)
 		signal.Notify(sigChan, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)
 
-		sig := <-sigChan
-		logger.Info("Receive os signal", zap.Stringer("signal", sig))
-
-		// Cancel the parent context
-		// This will cascade to errgroup context
-		cancel()
-
-		// No error for graceful shutdown
-		return nil
-	})
+		select {
+		case sig := <-sigChan:
+			logger.Info("Received os signal", zap.Stringer("signal", sig))
+			// Cancel the parent context
+			// This will cascade to errgroup context
+			cancel()
+		case <-ctx.Done():
+		}
+	}()
 
 	logger.Info("Initialization complete")