Exit from goroutine if context was cancelled (#2)

chapsuk · Sep 28, 2018 · ea0e779 · ea0e779
1 parent 91b5357
commit ea0e779
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/shutdown.go b/shutdown.go
@@ -14,8 +14,12 @@ func ShutdownContext(c context.Context) context.Context {
 	go func() {
 		ch := make(chan os.Signal, 1)
 		signal.Notify(ch, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP)
-		<-ch
-		cancel()
+		select {
+		case <-ctx.Done():
+			return
+		case <-ch:
+			cancel()
+		}
 	}()
 	return ctx
 }