rpcmiddleware: thread context through to Start

ellemouton · ellemouton · commit 83a3209a32a6 · 2025-01-13T09:29:22.000+02:00
diff --git a/rpcmiddleware/manager.go b/rpcmiddleware/manager.go
@@ -36,8 +36,8 @@ func NewManager(interceptTimeout time.Duration,
 }
 
 // Start starts the firewall by registering the interceptors with lnd.
-func (f *Manager) Start() error {
-	ctxc, cancel := context.WithCancel(context.Background())
+func (f *Manager) Start(ctx context.Context) error {
+	ctxc, cancel := context.WithCancel(ctx)
 	f.cancel = cancel
 
 	for _, i := range f.interceptors {
diff --git a/terminal.go b/terminal.go
@@ -1104,7 +1104,7 @@ func (g *LightningTerminal) startInternalSubServers(ctx context.Context,
 		g.lndClient.Client, g.errQueue.ChanIn(), mw...,
 	)
 
-	if err = g.middleware.Start(); err != nil {
+	if err = g.middleware.Start(ctx); err != nil {
 		return err
 	}
 	g.middlewareStarted = true

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ func NewManager(interceptTimeout time.Duration,`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`// Start starts the firewall by registering the interceptors with lnd.`
`39`		`-func (f *Manager) Start() error {`
`40`		`- ctxc, cancel := context.WithCancel(context.Background())`
	`39`	`+func (f *Manager) Start(ctx context.Context) error {`
	`40`	`+ ctxc, cancel := context.WithCancel(ctx)`
`41`	`41`	`f.cancel = cancel`
`42`	`42`
`43`	`43`	`for _, i := range f.interceptors {`
Original file line number	Diff line number	Diff line change
`@@ -1104,7 +1104,7 @@ func (g *LightningTerminal) startInternalSubServers(ctx context.Context,`
`1104`	`1104`	`g.lndClient.Client, g.errQueue.ChanIn(), mw...,`
`1105`	`1105`	`)`
`1106`	`1106`
`1107`		`- if err = g.middleware.Start(); err != nil {`
	`1107`	`+ if err = g.middleware.Start(ctx); err != nil {`
`1108`	`1108`	`return err`
`1109`	`1109`	`}`
`1110`	`1110`	`g.middlewareStarted = true`