From 82a69701ceb554d3838089ef4f92326ebf603d16 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Fri, 10 Jan 2020 11:43:53 +0100
Subject: [PATCH] catch etcd in scripts/

---
 scripts/uncloud | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/uncloud b/scripts/uncloud
index 6da98e0..4f9b38b 100755
--- a/scripts/uncloud
+++ b/scripts/uncloud
@@ -71,20 +71,22 @@ if __name__ == '__main__':
         # module to not inherit anything from parent.
         # mp.set_start_method('spawn')
         arguments = vars(args)
-        print(arguments)
-        print(etcd_parser)
-
         name = arguments.pop('command')
         mod = importlib.import_module('uncloud.{}.main'.format(name))
         main = getattr(mod, 'main')
 
-        if component in ETCD_COMPONENTS:
+        # If the component requires etcd3, we import it and catch the
+        # etcd3.exceptions.ConnectionFailedError
+        if name in ETCD_COMPONENTS:
             import etcd3
+
         try:
             main(arguments)
         except UncloudException as err:
             logger.error(err)
             sys.exit(1)
+        except etcd3.exceptions.ConnectionFailedError as err:
+            logger.error("Cannot connect to etcd")
         except Exception as err:
             logger.exception(err)
             sys.exit(1)