Skip to content

Commit b0931f4

Browse files
committed
multi: let subserver manager handle disabled sub-server
Modify the sub-server Manager's AddServer method to take an `enabled` boolean so that it can handle what to do with a disabled sub-server. This will come into play in a future commit which adds a status server.
1 parent 59ebfe4 commit b0931f4

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

subservers/manager.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,23 @@ func NewManager(permsMgr *perms.Manager) *Manager {
4545
}
4646

4747
// AddServer adds a new subServer to the manager's set.
48-
func (s *Manager) AddServer(ss SubServer) {
48+
func (s *Manager) AddServer(ss SubServer, enable bool) {
49+
// If the sub-server has explicitly been disabled, then we don't add it
50+
// to the set of servers tracked by the Manager.
51+
if !enable {
52+
return
53+
}
54+
4955
s.mu.Lock()
5056
defer s.mu.Unlock()
5157

58+
// Add the enabled server to the set of servers tracked by the Manager.
5259
s.servers = append(s.servers, &subServerWrapper{
5360
SubServer: ss,
5461
quit: make(chan struct{}),
5562
})
5663

64+
// Register the sub-server's permissions with the permission manager.
5765
s.permsMgr.RegisterSubServer(
5866
ss.Name(), ss.Permissions(), ss.WhiteListedURLs(),
5967
)

terminal.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1471,22 +1471,22 @@ func (g *LightningTerminal) initSubServers() {
14711471
g.subServerMgr.AddServer(subservers.NewFaradaySubServer(
14721472
g.cfg.Faraday, g.cfg.faradayRpcConfig, g.cfg.Remote.Faraday,
14731473
g.cfg.faradayRemote,
1474-
))
1474+
), true)
14751475

14761476
g.subServerMgr.AddServer(subservers.NewLoopSubServer(
14771477
g.cfg.Loop, g.cfg.Remote.Loop, g.cfg.loopRemote,
1478-
))
1478+
), true)
14791479

14801480
g.subServerMgr.AddServer(subservers.NewPoolSubServer(
14811481
g.cfg.Pool, g.cfg.Remote.Pool, g.cfg.poolRemote,
1482-
))
1482+
), true)
14831483

1484-
if g.cfg.TaprootAssetsMode != ModeDisable {
1485-
g.subServerMgr.AddServer(subservers.NewTaprootAssetsSubServer(
1484+
g.subServerMgr.AddServer(
1485+
subservers.NewTaprootAssetsSubServer(
14861486
g.cfg.TaprootAssets, g.cfg.Remote.TaprootAssets,
14871487
g.cfg.tapRemote,
1488-
))
1489-
}
1488+
), g.cfg.TaprootAssetsMode != ModeDisable,
1489+
)
14901490
}
14911491

14921492
// BakeSuperMacaroon uses the lnd client to bake a macaroon that can include

0 commit comments

Comments
 (0)