fix signaling

reddec · Jul 6, 2017 · b897a94 · b897a94
1 parent 241b746
commit b897a94
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.goxc.json b/.goxc.json
@@ -3,12 +3,12 @@
 		"default",
 		"publish-github"
 	],
-	"PackageVersion": "0.0.1",
+	"PackageVersion": "0.0.2",
 	"TaskSettings": {
 		"publish-github": {
 			"owner": "reddec",
 			"repository": "monexec"
 		}
 	},
 	"ConfigVersion": "0.9"
-}
+}
diff --git a/main.go b/main.go
@@ -232,7 +232,7 @@ main() {
 		ctx, stp := context.WithCancel(context.Background())
 
 		c := make(chan os.Signal, 3)
-		signal.Notify(c, os.Interrupt, os.Kill, syscall.SIGHUP)
+		signal.Notify(c, os.Interrupt, syscall.SIGTERM)
 		go func() {
 			for range c {
 				stp()

diff --git a/monexec/executable.go b/monexec/executable.go
@@ -83,8 +83,8 @@ func (b *Executable) Env(arg, value string) *Executable {
 // SIGTERM is used
 func (exe *Executable) stopOrKill(logger *log.Logger, cmd *exec.Cmd) {
 	ch := make(chan struct{}, 1)
-	logger.Println("Sending SIGKILL")
-	cmd.Process.Kill()
+	logger.Println("Sending SIGKTERM")
+	cmd.Process.Signal(syscall.SIGTERM)
 	go func() {
 		cmd.Wait()
 		ch <- struct{}{}
@@ -95,7 +95,7 @@ func (exe *Executable) stopOrKill(logger *log.Logger, cmd *exec.Cmd) {
 		logger.Println("Process gracefull stopped")
 	case <-time.After(exe.StopTimeout):
 		logger.Println("Process gracefull shutdown waiting timeout")
-		cmd.Process.Signal(syscall.SIGTERM)
+		cmd.Process.Signal(syscall.SIGKILL)
 	}
 }