subservers+terminal: integrate status server

Pass the status manager to the sub-server manager so that the sub-server
manager can inform the status manager of any sub-servers that have
started or failed to start.

Author: ellemouton

subservers/manager.go

@@ -9,6 +9,7 @@ import (
 
 	restProxy "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/lightninglabs/lightning-terminal/perms"
+	"github.com/lightninglabs/lightning-terminal/status"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightningnetwork/lnd/lncfg"
 	"github.com/lightningnetwork/lnd/lnrpc"
@@ -32,20 +33,27 @@ var (
 
 // Manager manages a set of subServer objects.
 type Manager struct {
-	servers  []*subServerWrapper
-	permsMgr *perms.Manager
-	mu       sync.RWMutex
+	servers      []*subServerWrapper
+	permsMgr     *perms.Manager
+	statusServer *status.Manager
+	mu           sync.RWMutex
 }
 
-// NewManager constructs a new subServerMgr.
-func NewManager(permsMgr *perms.Manager) *Manager {
+// NewManager constructs a new Manager.
+func NewManager(permsMgr *perms.Manager,
+	statusServer *status.Manager) *Manager {
+
 	return &Manager{
-		permsMgr: permsMgr,
+		permsMgr:     permsMgr,
+		statusServer: statusServer,
 	}
 }
 
 // AddServer adds a new subServer to the manager's set.
 func (s *Manager) AddServer(ss SubServer, enable bool) {
+	// Register all sub-servers with the status server.
+	s.statusServer.RegisterSubServer(ss.Name())
+
 	// If the sub-server has explicitly been disabled, then we don't add it
 	// to the set of servers tracked by the Manager.
 	if !enable {
@@ -65,12 +73,15 @@ func (s *Manager) AddServer(ss SubServer, enable bool) {
 	s.permsMgr.RegisterSubServer(
 		ss.Name(), ss.Permissions(), ss.WhiteListedURLs(),
 	)
+
+	// Mark the sub-server as enabled with the status manager.
+	s.statusServer.SetEnabled(ss.Name())
 }
 
 // StartIntegratedServers starts all the manager's sub-servers that should be
 // started in integrated mode.
 func (s *Manager) StartIntegratedServers(lndClient lnrpc.LightningClient,
-	lndGrpc *lndclient.GrpcLndServices, withMacaroonService bool) error {
+	lndGrpc *lndclient.GrpcLndServices, withMacaroonService bool) {
 
 	s.mu.Lock()
 	defer s.mu.Unlock()
@@ -82,19 +93,24 @@ func (s *Manager) StartIntegratedServers(lndClient lnrpc.LightningClient,
 
 		err := ss.startIntegrated(
 			lndClient, lndGrpc, withMacaroonService,
+			func(err error) {
+				s.statusServer.SetErrored(
+					ss.Name(), err.Error(),
+				)
+			},
 		)
 		if err != nil {
-			return fmt.Errorf("unable to start %v in integrated "+
-				"mode: %v", ss.Name(), err)
+			s.statusServer.SetErrored(ss.Name(), err.Error())
+			continue
 		}
-	}
 
-	return nil
+		s.statusServer.SetRunning(ss.Name())
+	}
 }
 
 // ConnectRemoteSubServers creates connections to all the manager's sub-servers
 // that are running remotely.
-func (s *Manager) ConnectRemoteSubServers() error {
+func (s *Manager) ConnectRemoteSubServers() {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 
@@ -105,12 +121,12 @@ func (s *Manager) ConnectRemoteSubServers() error {
 
 		err := ss.connectRemote()
 		if err != nil {
-			return fmt.Errorf("failed to connect to remote %s: %v",
-				ss.Name(), err)
+			s.statusServer.SetErrored(ss.Name(), err.Error())
+			continue
 		}
-	}
 
-	return nil
+		s.statusServer.SetRunning(ss.Name())
+	}
 }
 
 // RegisterRPCServices registers all the manager's sub-servers with the given
@@ -301,6 +317,8 @@ func (s *Manager) Stop() error {
 			log.Errorf("Error stopping %s: %v", ss.Name(), err)
 			returnErr = err
 		}
+
+		s.statusServer.SetStopped(ss.Name())
 	}
 
 	return returnErr

subservers/subserver.go

@@ -99,7 +99,8 @@ func (s *subServerWrapper) stop() error {
 
 // startIntegrated starts the subServer in integrated mode.
 func (s *subServerWrapper) startIntegrated(lndClient lnrpc.LightningClient,
-	lndGrpc *lndclient.GrpcLndServices, withMacaroonService bool) error {
+	lndGrpc *lndclient.GrpcLndServices, withMacaroonService bool,
+	onError func(error)) error {
 
 	err := s.Start(lndClient, lndGrpc, withMacaroonService)
 	if err != nil {
@@ -121,11 +122,11 @@ func (s *subServerWrapper) startIntegrated(lndClient lnrpc.LightningClient,
 			// happens. We don't need to try to stop it again.
 			s.setStarted(false)
 
-			err = fmt.Errorf("received critical error from "+
-				"sub-server (%s), shutting down: %v",
-				s.Name(), err)
-
-			log.Error(err)
+			onError(
+				fmt.Errorf("received critical error from "+
+					"sub-server (%s), shutting down: %v",
+					s.Name(), err),
+			)
 
 		case <-s.quit:
 		}

terminal.go

@@ -234,7 +234,7 @@ func (g *LightningTerminal) Run() error {
 
 	// Create the instances of our subservers now so we can hook them up to
 	// lnd once it's fully started.
-	g.subServerMgr = subservers.NewManager(g.permsMgr)
+	g.subServerMgr = subservers.NewManager(g.permsMgr, g.statusMgr)
 
 	// Register our sub-servers. This must be done before the REST proxy is
 	// set up so that the correct REST handlers are registered.
@@ -511,10 +511,7 @@ func (g *LightningTerminal) start() error {
 
 	// Initialise any connections to sub-servers that we are running in
 	// remote mode.
-	if err := g.subServerMgr.ConnectRemoteSubServers(); err != nil {
-		return fmt.Errorf("error connecting to remote sub-servers: %v",
-			err)
-	}
+	g.subServerMgr.ConnectRemoteSubServers()
 
 	// bakeSuperMac is a closure that can be used to bake a new super
 	// macaroon that contains all active permissions.
@@ -615,12 +612,9 @@ func (g *LightningTerminal) start() error {
 
 	// Both connection types are ready now, let's start our sub-servers if
 	// they should be started locally as an integrated service.
-	err = g.subServerMgr.StartIntegratedServers(
+	g.subServerMgr.StartIntegratedServers(
 		g.basicClient, g.lndClient, createDefaultMacaroons,
 	)
-	if err != nil {
-		return fmt.Errorf("could not start subservers: %v", err)
-	}
 
 	err = g.startInternalSubServers(createDefaultMacaroons)
 	if err != nil {