diff options
| -rw-r--r-- | changes/bug-7451_missing-attribute | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/services/soledad/soledadbootstrapper.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/changes/bug-7451_missing-attribute b/changes/bug-7451_missing-attribute new file mode 100644 index 00000000..502210c6 --- /dev/null +++ b/changes/bug-7451_missing-attribute @@ -0,0 +1 @@ +- Assign the timeout 'call later' before starting the sync to prevent race conditions. Related to #7451. diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py index ec758833..f3d50925 100644 --- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py +++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py @@ -623,10 +623,10 @@ class Syncer(object): logger.debug("BOOTSTRAPPER: trying to sync Soledad....") # pass defer_decryption=False to get inline decryption # for debugging. - self._sync_deferred = self._soledad.sync(defer_decryption=True) - self._sync_deferred.addCallbacks(self._success, self._error) self._timeout_delayed_call = reactor.callLater(self.WAIT_MAX_SECONDS, self._timeout) + self._sync_deferred = self._soledad.sync(defer_decryption=True) + self._sync_deferred.addCallbacks(self._success, self._error) def _success(self, result): logger.debug("Soledad has been synced!") |