Log the exception if device scan fails, and exit. rockstor#1026

schakrava · Nov 30, 2015 · c4fe6b0 · c4fe6b0
1 parent 39e60e7
commit c4fe6b0
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/rockstor/scripts/bootstrap.py b/src/rockstor/scripts/bootstrap.py
@@ -33,13 +33,19 @@
 
 
 def main():
-    aw = APIWrapper()
-    device_scan()
+
+    try:
+        device_scan()
+    except Exception, e:
+        print ('BTRFS device scan failed due to an exception. This indicates '
+               'a serious problem. Aborting. Exception: %s' % e.__str__())
+        sys.exit(1)
     print('BTRFS device scan complete')
 
     num_attempts = 0
     while True:
         try:
+            aw = APIWrapper()
             aw.api_call('network')
             aw.api_call('commands/bootstrap', calltype='post')
             break