use signal.NotifyContext

catatsuy · Feb 28, 2021 · d84e731 · d84e731
1 parent 9864faa
commit d84e731
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 17 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: [ '1.15.x', '1.16.x' ]
+        go: [ '1.16.x' ]
     steps:
 
     - name: Set up Go

diff --git a/cli/cli.go b/cli/cli.go
@@ -161,8 +161,8 @@ func (c *CLI) Run(args []string) int {
 
 	ex := throttle.NewExec(copyStdin)
 
-	sigC := make(chan os.Signal, 1)
-	signal.Notify(sigC, syscall.SIGTERM, syscall.SIGINT)
+	ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGTERM, syscall.SIGINT)
+	defer stop()
 
 	channel := c.conf.PrimaryChannel
 	if channel == "" {
@@ -196,20 +196,7 @@ func (c *CLI) Run(args []string) int {
 	ticker := time.NewTicker(c.conf.Duration)
 	defer ticker.Stop()
 
-	ctx, cancel := context.WithCancel(context.Background())
-
-	exitC := make(chan struct{})
-	go func() {
-		ex.Start(ctx, ticker.C, flushCallback, doneCallback)
-		close(exitC)
-	}()
-
-	select {
-	case <-sigC:
-	case <-exitC:
-	}
-	cancel()
-
+	ex.Start(ctx, ticker.C, flushCallback, doneCallback)
 	<-done
 
 	return ExitCodeOK