Merge pull request #12 from adhocore/ctrl-c

Ctrl C
adhocore · Oct 20, 2024 · d0b6ae1 · d0b6ae1
2 parents d095a70 + 8e9fb39
commit d0b6ae1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/cmd/fast/main.go b/cmd/fast/main.go
@@ -3,7 +3,10 @@ package main
 import (
 	"flag"
 	"log"
+	"os"
+	"os/signal"
 	"sync"
+	"syscall"
 	"time"
 
 	"github.com/adhocore/chin"
@@ -23,9 +26,17 @@ func main() {
 	s := chin.New().WithWait(&wg)
 	go s.Start()
 
+	var sig = make(chan os.Signal, 1)
+	signal.Notify(sig, os.Interrupt, syscall.SIGTERM, syscall.SIGABRT)
+
 	wg.Add(1)
 	go doFast(s, &wg, noUp)
 
+	go func() {
+		<-sig
+		s.Stop()
+	}()
+
 	wg.Wait()
 }
 

diff --git a/fast.go b/fast.go
@@ -61,7 +61,7 @@ func Measure(noUp bool) (*Fast, error) {
 
 	var err error
 	for _, browser := range browsers {
-		err = doMeasure(browser, fast, cmds...)
+		err = doMeasure(browser, cmds...)
 		if err == nil || !errors.Is(err, exec.ErrNotFound) {
 			break
 		}
@@ -70,7 +70,7 @@ func Measure(noUp bool) (*Fast, error) {
 	return fast, err
 }
 
-func doMeasure(browser string, fast *Fast, cmds ...chromedp.Action) error {
+func doMeasure(browser string, cmds ...chromedp.Action) error {
 	opts := chromedp.DefaultExecAllocatorOptions[:]
 	if browser != "" {
 		opts = append(opts, chromedp.ExecPath(browser))