fix(serve): signal group couldn't be canceled (#208)

* fix(serve): signal group couldn't be canceled

* fix: remove dupe

Author: Reasno

serve.go

@@ -157,6 +157,7 @@ func (s serveIn) cronServe(ctx context.Context, logger logging.LevelLogger) (fun
 func (s serveIn) signalWatch(ctx context.Context, logger logging.LevelLogger) (func() error, func(err error), error) {
 	sig := make(chan os.Signal, 1)
 	signal.Notify(sig, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP)
+	ctx, cancel := context.WithCancel(ctx)
 	return func() error {
 			select {
 			case n := <-sig:
@@ -167,6 +168,7 @@ func (s serveIn) signalWatch(ctx context.Context, logger logging.LevelLogger) (f
 			return nil
 		}, func(err error) {
 			signal.Stop(sig)
+			cancel()
 		}, nil
 }
 

serve_test.go

@@ -3,6 +3,7 @@ package core
 import (
 	"bytes"
 	"context"
+	"errors"
 	"os"
 	"testing"
 	"time"
@@ -19,22 +20,37 @@ func TestServeIn_signalWatch(t *testing.T) {
 	do, cancel, err := in.signalWatch(context.Background(), logging.WithLevel(log.NewLogfmtLogger(&buf)))
 	assert.NoError(t, err)
 
-	var group run.Group
-	group.Add(do, cancel)
-	group.Add(func() error {
-		time.Sleep(time.Second)
-		p, err := os.FindProcess(os.Getpid())
-		if err != nil {
-			t.Skip("TestServeIn_signalWatch only works on unix")
-		}
-		if err := p.Signal(os.Interrupt); err != nil {
-			t.Skip("TestServeIn_signalWatch only works on unix")
-		}
-		// trigger the signal twice should be ok.
-		p.Signal(os.Interrupt)
-		return nil
-	}, func(err error) {})
-	err = group.Run()
-	assert.NoError(t, err)
-	assert.Contains(t, buf.String(), "signal received: interrupt")
+	t.Run("stop when signal received", func(t *testing.T) {
+		var group run.Group
+		group.Add(do, cancel)
+		group.Add(func() error {
+			time.Sleep(time.Second)
+			p, err := os.FindProcess(os.Getpid())
+			if err != nil {
+				t.Skip("TestServeIn_signalWatch only works on unix")
+			}
+			if err := p.Signal(os.Interrupt); err != nil {
+				t.Skip("TestServeIn_signalWatch only works on unix")
+			}
+			// trigger the signal twice should be ok.
+			p.Signal(os.Interrupt)
+			return nil
+		}, func(err error) {})
+		err = group.Run()
+		assert.NoError(t, err)
+		assert.Contains(t, buf.String(), "signal received: interrupt")
+	})
+
+	t.Run("cancel when cancel func is called", func(t *testing.T) {
+		var group run.Group
+		group.Add(do, cancel)
+		group.Add(func() error {
+			return errors.New("some err")
+		}, func(err error) {
+
+		})
+		err = group.Run()
+		assert.Contains(t, buf.String(), "context canceled")
+	})
+
 }