(BC) closer.New now returns notifiable context

Author: a-menshchikov

closer/closer.go

@@ -35,7 +35,7 @@ type closer struct {
 	once  sync.Once
 }
 
-var global = New(context.Background())
+var _, global = New(context.Background())
 
 // SetContext sets context into the global Closer.
 func SetContext(ctx context.Context) {
@@ -62,28 +62,31 @@ func CloseAll() {
 	global.CloseAll()
 }
 
-// New returns base Closer implementation.
+// New returns signal notifiable Context and base Closer implementation.
 //
 // If signals specified, then close functions will trigger when any arrives.
-func New(ctx context.Context, signals ...os.Signal) *closer {
+func New(ctx context.Context, signals ...os.Signal) (context.Context, *closer) {
 	c := &closer{done: make(chan struct{})}
 	if ctx == nil {
 		panic("cannot create closer with nil context")
 	}
 	c.ctx.Store(&ctx)
 
+	var cancel context.CancelFunc
+	if len(signals) > 0 {
+		ctx, cancel = signal.NotifyContext(ctx, signals...)
+	}
+
 	go func() {
-		if len(signals) > 0 {
-			var cancel context.CancelFunc
-			ctx, cancel = signal.NotifyContext(ctx, signals...)
+		if cancel != nil {
 			defer cancel()
 		}
 
 		<-ctx.Done()
 		c.CloseAll() //nolint:contextcheck
 	}()
 
-	return c
+	return ctx, c
 }
 
 func (c *closer) SetContext(ctx context.Context) {

closer/closer_test.go

@@ -43,7 +43,7 @@ func TestCloser(t *testing.T) {
 		goleak.VerifyNone(t, goleak.IgnoreCurrent())
 
 		ctx, cancel := context.WithCancel(context.Background())
-		c := New(ctx)
+		_, c := New(ctx)
 
 		var cnt atomic.Uint32
 		c.Add(func(context.Context) error {