fix: killing descendants

examples/hotreload/api/.pw.yml

@@ -21,7 +21,6 @@ watchers:
       timeout: 3s
     cmd: 
       shell: /bin/sh -c
-      exec: dlv debug --headless -l :2345 --api-version=2 --accept-multiclient --log --continue ./cmd/api
-      env: 
-        - GO111MODULE=off
-
+      exec: go mod tidy; dlv debug --headless -l :2345 --api-version=2 --accept-multiclient --log --continue ./cmd/api
+      env:
+        - LOG_LEVEL=DEBUG

examples/hotreload/docker-compose.yml

@@ -6,10 +6,9 @@ services:
       context: context/go
     image: registry.ronaksoft.com/library/golang:dev
     entrypoint:
-      - go
-    command:
-      - run
-      - /go/src/github.com/pouyanh/polywatch/cmd/polywatch/main.go
+      - /bin/sh
+    command: >
+      -c "(cd /go/src/github.com/pouyanh/polywatch/cmd/polywatch; go mod tidy; go build -o /bin/polywatch); /bin/polywatch"
     healthcheck:
       test:
         - "CMD"
@@ -31,12 +30,11 @@ services:
     working_dir: /go/src/github.com/pouyanh/polywatch/examples/hotreload/api
     volumes:
       - gosrc:/go/src
-      # - gomod:/go/pkg/mod
+      - gomod:/go/pkg/mod
       - /etc/localtime:/etc/localtime:ro
     environment:
       HOSTNAME: api.hotreload.plw
 
-      GO111MODULE: off
       GOPRIVATE: github.com/pouyanh*,github.com/janstoon*
 
 volumes:

polywatch.go

@@ -7,8 +7,10 @@ import (
 	"log"
 	"os"
 	"os/exec"
+	"os/signal"
 	"strings"
 	"sync"
+	"syscall"
 
 	"github.com/radovskyb/watcher"
 	"github.com/zmwangx/debounce"
@@ -42,6 +44,15 @@ func Start() error {
 		}()
 	}
 
+	cchan := make(chan os.Signal)
+	signal.Notify(cchan, syscall.SIGTERM, syscall.SIGINT)
+
+	go func() {
+		<-cchan
+
+		stop()
+	}()
+
 	wg.Wait()
 
 	return nil
@@ -112,6 +123,7 @@ func (pw *polyWatcher) renewCommand() {
 
 	cmd := exec.Command(rawcmd[0], rawcmd[1:]...)
 	cmd.Env = pw.cfg.Command.Env
+	cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true}
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 
@@ -229,13 +241,20 @@ func (pw *polyWatcher) kill(ctx context.Context) error {
 	pw.lg.Printf("killing previous command pid(%d) with sig(%s)", pw.cmd.Process.Pid, pw.cfg.Kill.Signal)
 
 	// todo: apply kill timeout
-
-	err := pw.cmd.Process.Signal(pw.cfg.Kill.Signal)
-	if err != nil {
-		pw.lg.Printf("unable to send signal to previous command: %s", err)
+	group, err := os.FindProcess(-1 * pw.cmd.Process.Pid)
+	if err == nil {
+		err = group.Signal(pw.cfg.Kill.Signal)
+		if err != nil {
+			pw.lg.Printf("unable to send signal to previous command: %s", err)
+		}
 	}
 
 	defer pw.renewCommand()
 
-	return pw.cmd.Wait()
+	err = pw.cmd.Wait()
+	if err != nil {
+		return err
+	}
+
+	return nil
 }

pw.example.yml

@@ -25,6 +25,6 @@ watchers:
       timeout: 3s
     cmd: 
       shell: /bin/sh -c
-      exec: dlv debug --headless -l :2345 --api-version=2 --accept-multiclient --log --continue ./cmd/api
+      exec: go mod tidy; dlv debug --headless -l :2345 --api-version=2 --accept-multiclient --log --continue ./cmd/api
       env: 
-        - GO111MODULE=off
+        - LOG_LEVEL=DEBUG