Merge pull request #694 from ViktorTigerstrom/2023-11-restart-lndclie…

…nt-on-failure multi: restart LND Client on setup failure
lightninglabs · Jan 5, 2024 · ee69bbd · ee69bbd
2 parents c757746 + fcd22a7
commit ee69bbd
Show file tree

Hide file tree

Showing 16 changed files with 319 additions and 103 deletions.
diff --git a/app/src/types/generated/lit-status_pb.d.ts b/app/src/types/generated/lit-status_pb.d.ts
diff --git a/app/src/types/generated/lit-status_pb.js b/app/src/types/generated/lit-status_pb.js
diff --git a/app/src/util/tests/sampleData.ts b/app/src/util/tests/sampleData.ts
@@ -1071,6 +1071,7 @@ export const litSubServerStatus: STATUS.SubServerStatusResp.AsObject = {
         disabled: false,
         running: true,
         error: '',
+        customStatus: '',
       },
     ],
     [
@@ -1079,6 +1080,7 @@ export const litSubServerStatus: STATUS.SubServerStatusResp.AsObject = {
         disabled: false,
         running: true,
         error: '',
+        customStatus: '',
       },
     ],
     [
@@ -1087,6 +1089,7 @@ export const litSubServerStatus: STATUS.SubServerStatusResp.AsObject = {
         disabled: false,
         running: true,
         error: '',
+        customStatus: '',
       },
     ],
     [
@@ -1095,6 +1098,7 @@ export const litSubServerStatus: STATUS.SubServerStatusResp.AsObject = {
         disabled: false,
         running: true,
         error: '',
+        customStatus: '',
       },
     ],
     [
@@ -1103,6 +1107,7 @@ export const litSubServerStatus: STATUS.SubServerStatusResp.AsObject = {
         disabled: false,
         running: true,
         error: '',
+        customStatus: '',
       },
     ],
     [
@@ -1111,6 +1116,7 @@ export const litSubServerStatus: STATUS.SubServerStatusResp.AsObject = {
         disabled: false,
         running: true,
         error: '',
+        customStatus: '',
       },
     ],
   ],

diff --git a/autopilotserverrpc/autopilotserver.pb.go b/autopilotserverrpc/autopilotserver.pb.go
diff --git a/litrpc/firewall.pb.go b/litrpc/firewall.pb.go
diff --git a/litrpc/lit-accounts.pb.go b/litrpc/lit-accounts.pb.go
diff --git a/litrpc/lit-autopilot.pb.go b/litrpc/lit-autopilot.pb.go
diff --git a/litrpc/lit-sessions.pb.go b/litrpc/lit-sessions.pb.go
diff --git a/litrpc/lit-status.pb.go b/litrpc/lit-status.pb.go
diff --git a/litrpc/lit-status.proto b/litrpc/lit-status.proto
@@ -28,4 +28,9 @@ message SubServerStatus {
     // error describes an error that might have resulted in the sub-server not
     // starting up properly.
     string error = 3;
+
+    // custom_status details a custom state that the sub-server has entered,
+    // which is unique to the sub-server, and which is not the standard
+    // disabled, running or errored state.
+    string custom_status = 4;
 }
diff --git a/litrpc/lit-status.swagger.json b/litrpc/lit-status.swagger.json
@@ -54,6 +54,10 @@
         "error": {
           "type": "string",
           "description": "error describes an error that might have resulted in the sub-server not\nstarting up properly."
+        },
+        "custom_status": {
+          "type": "string",
+          "description": "custom_status details a custom state that the sub-server has entered,\nwhich is unique to the sub-server, and which is not the standard\ndisabled, running or errored state."
         }
       }
     },

diff --git a/litrpc/proxy.pb.go b/litrpc/proxy.pb.go
diff --git a/proto/lit-status.proto b/proto/lit-status.proto
@@ -28,4 +28,9 @@ message SubServerStatus {
     // error describes an error that might have resulted in the sub-server not
     // starting up properly.
     string error = 3;
+
+    // custom_status details a custom state that the sub-server has entered,
+    // which is unique to the sub-server, and which is not the standard
+    // disabled, running or errored state.
+    string custom_status = 4;
 }
diff --git a/rpc_proxy.go b/rpc_proxy.go
@@ -638,18 +638,17 @@ func (p *rpcProxy) checkSubSystemStarted(requestURI string) error {
 
 	// Check with the status manger to see if the sub-server is ready to
 	// handle the request.
-	serverStatus, err := p.statusMgr.GetStatus(system)
+	ready, disabled, err := p.statusMgr.IsSystemReady(system, requestURI)
 	if err != nil {
 		return err
 	}
 
-	if serverStatus.Disabled {
+	if disabled {
 		return fmt.Errorf("%s has been disabled", system)
 	}
 
-	if !serverStatus.Running {
-		return fmt.Errorf("%s is not running: %s", system,
-			serverStatus.Err)
+	if !ready {
+		return fmt.Errorf("%s is not ready for: %s", system, requestURI)
 	}
 
 	return nil