Merge pull request #8 from rnapier/master

Run() should watch for SIGTERM on POSIX platforms

service_darwin.go

@@ -10,6 +10,7 @@ import (
 	"os/exec"
 	"os/signal"
 	"os/user"
+	"syscall"
 	"text/template"
 	"time"
 
@@ -172,7 +173,7 @@ func (s *darwinLaunchdService) Run() error {
 
 	var sigChan = make(chan os.Signal, 3)
 
-	signal.Notify(sigChan, os.Interrupt, os.Kill)
+	signal.Notify(sigChan, syscall.SIGTERM, os.Interrupt)
 
 	<-sigChan
 

service_systemd_linux.go

@@ -10,6 +10,7 @@ import (
 	"os"
 	"os/exec"
 	"os/signal"
+	"syscall"
 	"text/template"
 	"time"
 
@@ -130,7 +131,7 @@ func (s *systemd) Run() (err error) {
 
 	sigChan := make(chan os.Signal, 3)
 
-	signal.Notify(sigChan, os.Interrupt, os.Kill)
+	signal.Notify(sigChan, syscall.SIGTERM, os.Interrupt)
 
 	<-sigChan
 

service_sysv_linux.go

@@ -10,6 +10,7 @@ import (
 	"os"
 	"os/exec"
 	"os/signal"
+	"syscall"
 	"text/template"
 	"time"
 
@@ -131,7 +132,7 @@ func (s *sysv) Run() (err error) {
 
 	sigChan := make(chan os.Signal, 3)
 
-	signal.Notify(sigChan, os.Interrupt, os.Kill)
+	signal.Notify(sigChan, syscall.SIGTERM, os.Interrupt)
 
 	<-sigChan
 

service_upstart_linux.go

@@ -10,6 +10,7 @@ import (
 	"os"
 	"os/exec"
 	"os/signal"
+	"syscall"
 	"text/template"
 	"time"
 
@@ -122,7 +123,7 @@ func (s *upstart) Run() (err error) {
 
 	sigChan := make(chan os.Signal, 3)
 
-	signal.Notify(sigChan, os.Interrupt, os.Kill)
+	signal.Notify(sigChan, syscall.SIGTERM, os.Interrupt)
 
 	<-sigChan