Merge branch 'master' of https://github.com/facebookgo/grace

captain401 · Dec 1, 2016 · b07a63a · b07a63a
2 parents 19fccdb + 5729e48
commit b07a63a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,9 @@
 language: go
 
 go:
-  - 1.4
+  - 1.7
 
 before_install:
-  - go get -v golang.org/x/tools/cmd/vet
-  - go get -v golang.org/x/tools/cmd/cover
   - go get -v github.com/golang/lint/golint
 
 install:

diff --git a/gracehttp/http.go b/gracehttp/http.go
@@ -101,12 +101,12 @@ func (a *App) term(wg *sync.WaitGroup) {
 
 func (a *App) signalHandler(wg *sync.WaitGroup) {
 	ch := make(chan os.Signal, 10)
-	signal.Notify(ch, syscall.SIGTERM, syscall.SIGUSR2)
+	signal.Notify(ch, syscall.SIGINT, syscall.SIGTERM, syscall.SIGUSR2)
 	for {
 		sig := <-ch
 		switch sig {
-		case syscall.SIGTERM:
-			// this ensures a subsequent TERM will trigger standard go behaviour of
+		case syscall.SIGINT, syscall.SIGTERM:
+			// this ensures a subsequent INT/TERM will trigger standard go behaviour of
 			// terminating.
 			signal.Stop(ch)
 			a.term(wg)