be more responsive when waiting for xud to be ready

Author: reliveyy

images/utils/launcher/__init__.py

@@ -255,3 +255,5 @@ def launch(self):
             print()
         except NoWaiting:
             pass
+        except FatalError as e:
+            print("💀 %s." % str(e))

images/utils/launcher/node/xud.py

@@ -12,7 +12,7 @@
 
 from launcher.table import ServiceTable
 from launcher.utils import yes_or_no, normalize_path
-from launcher.errors import NoWaiting
+from launcher.errors import NoWaiting, FatalError
 from .base import Node, CliBackend, CliError
 from .lnd import CFHeaderState
 
@@ -484,6 +484,25 @@ def _wait_tls_cert(self, stop: threading.Event):
                 break
             stop.wait(1)
 
+    def _wait_xud_ready(self, stop: threading.Event):
+        # Error: ENOENT: no such file or directory, open '/root/.xud/tls.cert'
+        # xud is starting... try again in a few seconds
+        # xud is locked, run 'xucli unlock', 'xucli create', or 'xucli restore' then try again
+        cmd = self._cli + " getinfo -j"
+        while not stop.is_set():
+            try:
+                if not self.is_running:
+                    raise FatalError("XUD container \"%s\" stopped unexpectedly" % self.container_name)
+                exit_code, output = self.exec(cmd)
+                if exit_code == 0:
+                    break
+                if "xud is locked" in output:
+                    break
+                logger.debug("[Execute] %s (exit_code=%s)\n%s", cmd, exit_code, output.rstrip())
+            except docker.errors.APIError:
+                logger.exception("Failed to getinfo")
+            stop.wait(1)
+
     def ensure_ready(self, stop: threading.Event):
         logger.info("Ensuring XUD is ready")
 
@@ -496,33 +515,30 @@ def ensure_ready(self, stop: threading.Event):
 
         logger.info("Waiting for XUD to be ready")
         executor = self.config.executor
-        f = executor.submit(self._wait_tls_cert, stop)
 
+        f = executor.submit(self._wait_tls_cert, stop)
         while not stop.is_set():
             logger.info("Waiting for XUD tls.cert to be created")
             try:
                 f.result(30)
+                break
             except TimeoutError:
-                print("XUD should not take so much time to create \"tls.cert\" file. please check container \"%s\" logs for more details." % self.container_name)
+                print("XUD should not take so long to create \"tls.cert\" file. please check container \"%s\" logs for more details." % self.container_name)
                 reply = yes_or_no("Would you like to keep waiting?")
                 if reply == "no":
                     raise NoWaiting
 
-        # Error: ENOENT: no such file or directory, open '/root/.xud/tls.cert'
-        # xud is starting... try again in a few seconds
-        # xud is locked, run 'xucli unlock', 'xucli create', or 'xucli restore' then try again
-        cmd = self._cli + " getinfo -j"
+        f = executor.submit(self._wait_xud_ready, stop)
         while not stop.is_set():
+            logger.info("Waiting for XUD to be ready")
             try:
-                exit_code, output = self.exec(cmd)
-                if exit_code == 0:
-                    break
-                if "xud is locked" in output:
-                    break
-                logger.debug("[Execute] %s (exit_code=%s)\n%s", cmd, exit_code, output.rstrip())
-            except docker.errors.APIError:
-                logger.exception("Failed to getinfo")
-            stop.wait(1)
+                f.result(10)
+                break
+            except TimeoutError:
+                print("XUD should not take so long to be ready. please check container \"%s\" logs for more details." % self.container_name)
+                reply = yes_or_no("Would you like to keep waiting?")
+                if reply == "no":
+                    raise NoWaiting
 
         if not self.has_wallets():
             logger.info("Setting up XUD wallets")