Retry bootstrapping on every exception. rockstor#1026

schakrava · Nov 30, 2015 · 39e60e7 · 39e60e7
1 parent 06c7c32
commit 39e60e7
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/rockstor/scripts/bootstrap.py b/src/rockstor/scripts/bootstrap.py
@@ -43,14 +43,17 @@ def main():
             aw.api_call('network')
             aw.api_call('commands/bootstrap', calltype='post')
             break
-        except requests.exceptions.ConnectionError, e:
+        except Exception, e:
+            #Retry on every exception, primarily because of django-oauth related
+            #code behaving unpredictably while setting tokens. Retrying is a
+            #decent workaround for now(11302015).
             if (num_attempts > 15):
                 print('Max attempts(15) reached. Connection errors persist. '
                       'Failed to bootstrap. Error: %s' % e.__str__())
                 sys.exit(1)
-            print('Connection error while bootstrapping. This could be because '
+            print('Exception occured while bootstrapping. This could be because '
                   'rockstor.service is still starting up. will wait 2 seconds '
-                  'and try again.')
+                  'and try again. Exception: %s' % e.__str__())
             time.sleep(2)
             num_attempts += 1
     print('Bootstrapping complete')