rpc_proxy: allow Litd's StopDaemon call at any time

Author: ellemouton

rpc_proxy.go

@@ -194,6 +194,16 @@ func isStatusReq(uri string) bool {
 	)
 }
 
+// isShutdownReq returns true if the given request is a Litd shutdown request.
+func isShutdownReq(uri string) bool {
+	return strings.HasPrefix(
+		uri, fmt.Sprintf(
+			"/%s/%s", litrpc.LitService_ServiceDesc.ServiceName,
+			"StopDaemon",
+		),
+	)
+}
+
 // Stop shuts down the lnd connection.
 func (p *rpcProxy) Stop() error {
 	p.grpcServer.Stop()
@@ -397,8 +407,9 @@ func (p *rpcProxy) checkSubSystemStarted(requestURI string) error {
 		system = LitdSubServer
 
 		// If the request is for the status server, then we allow the
-		// request even if Lit has not properly started.
-		if isStatusReq(requestURI) {
+		// request even if Lit has not properly started. We also allow
+		// the request through if it is a Litd shutdown.
+		if isStatusReq(requestURI) || isShutdownReq(requestURI) {
 			return nil
 		}
 

terminal.go

@@ -576,8 +576,8 @@ func (g *LightningTerminal) start() error {
 
 	case err := <-g.errQueue.ChanOut():
 		if err != nil {
-			log.Errorf("Received critical error from subsystem, "+
-				"shutting down: %v", err)
+			return fmt.Errorf("received critical error from "+
+				"subsystem, shutting down: %v", err)
 		}
 
 	case <-lndQuit: