check: Support SIGTERM with --pause-on-fail

If the user does --pause-on-fail and then does ctrl+c, it should terminate the program rather than waiting for the user to input a line first. Signed-off-by: Joe Stringer <[email protected]>
cilium · Oct 13, 2023 · 8a38f71 · 8a38f71
1 parent f6d43e9
commit 8a38f71
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/connectivity/check/logging.go b/connectivity/check/logging.go
@@ -4,9 +4,13 @@
 package check
 
 import (
+	"context"
 	"fmt"
 	"io"
+	"os"
+	"os/signal"
 	"runtime"
+	"syscall"
 	"time"
 )
 
@@ -286,7 +290,16 @@ func (t *Test) failCommon() {
 	t.flush()
 	if t.ctx.params.PauseOnFail {
 		t.log("Pausing after action failure, press the Enter key to continue:")
-		fmt.Scanln()
+		cont := make(chan struct{})
+		go func() {
+			fmt.Scanln()
+			close(cont)
+		}()
+		ctx, _ := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
+		select {
+		case <-cont:
+		case <-ctx.Done():
+		}
 	}
 	if t.ctx.params.CollectSysdumpOnFailure {
 		t.collectSysdump()