diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-03-07 17:24:33 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-03-07 17:28:57 -0300 |
| commit | 17fcf4f3efd1c016bd0f93129b4bedfd8ca92309 (patch) | |
| tree | 2aa46ff7b3718bc7da4f63ccd934f651934973f3 | |
| parent | 2545e54bdb025ff09ef4e12ddf7a4515142b8dc1 (diff) | |
Run all the soledad bootstrap on error.
Before this fix, if the soledad bootstrapping failed during the first
download process, we retried since after that point which caused a
failure.
| -rw-r--r-- | changes/better-soledad-retry | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/changes/better-soledad-retry b/changes/better-soledad-retry new file mode 100644 index 00000000..ac21f76c --- /dev/null +++ b/changes/better-soledad-retry @@ -0,0 +1 @@ +In case of soledad bootstrap error (e.g.: network failure), re run all the setup process. diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index eeab7e2b..6ef3920f 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -1247,8 +1247,7 @@ class MainWindow(QtGui.QMainWindow): self._soledad_bootstrapper.increment_retries_count() # XXX should cancel the existing socket --- this # is avoiding a clean termination. - threads.deferToThread( - self._soledad_bootstrapper.load_and_sync_soledad) + self._maybe_run_soledad_setup_checks() else: logger.warning("Max number of soledad initialization " "retries reached.") |