Remove unnecessary context wrappers

SagerNet · Dec 16, 2023 · ce83bad · ce83bad
1 parent eff46fd
commit ce83bad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 24 deletions.
diff --git a/service/pause/context.go b/service/pause/context.go
diff --git a/service/pause/default.go b/service/pause/default.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/sagernet/sing/common/atomic"
 	"github.com/sagernet/sing/common/x/list"
+	"github.com/sagernet/sing/service"
 )
 
 type defaultManager struct {
@@ -18,16 +19,20 @@ type defaultManager struct {
 	callbacks     list.List[Callback]
 }
 
-func NewDefaultManager(ctx context.Context) Manager {
+func WithDefaultManager(ctx context.Context) context.Context {
+	if service.FromContext[Manager](ctx) != nil {
+		return ctx
+	}
 	devicePauseChan := make(chan struct{})
 	networkPauseChan := make(chan struct{})
 	close(devicePauseChan)
 	close(networkPauseChan)
-	return &defaultManager{
+	manager := &defaultManager{
 		ctx:          ctx,
 		devicePause:  devicePauseChan,
 		networkPause: networkPauseChan,
 	}
+	return service.ContextWith[Manager](ctx, manager)
 }
 
 func (d *defaultManager) DevicePause() {