diff options
| author | Kali Kaneko <kali@leap.se> | 2015-10-06 10:56:27 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-10-06 10:56:27 -0400 |
| commit | 9975e9b4ecc553d13a5e5b283257af9fedab51bf (patch) | |
| tree | ce360620d46ec010a5af0035eb99394c86bdf26f /client/src | |
| parent | be2a2966ec6c8d8608424cf934a9313de3cac822 (diff) | |
| parent | 16ca8e6b7514dab3d2135c2c407780761bcd10b7 (diff) | |
Merge branch 'develop' into debian/platform-0.8
Diffstat (limited to 'client/src')
| -rw-r--r-- | client/src/leap/soledad/client/api.py | 2 | ||||
| -rw-r--r-- | client/src/leap/soledad/client/http_target/__init__.py | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/client/src/leap/soledad/client/api.py b/client/src/leap/soledad/client/api.py index a558addd..8c5f7f1b 100644 --- a/client/src/leap/soledad/client/api.py +++ b/client/src/leap/soledad/client/api.py @@ -723,7 +723,7 @@ class Soledad(object): return passthrough d.addCallbacks(_sync_callback, _sync_errback) - d.addBoth(_emit_done_data_sync) + d.addCallback(_emit_done_data_sync) return d @property diff --git a/client/src/leap/soledad/client/http_target/__init__.py b/client/src/leap/soledad/client/http_target/__init__.py index 7a5cea9f..498fb6e7 100644 --- a/client/src/leap/soledad/client/http_target/__init__.py +++ b/client/src/leap/soledad/client/http_target/__init__.py @@ -87,4 +87,8 @@ class SoledadHTTPSyncTarget(SyncTargetAPI, HTTPDocSender, HTTPDocFetcher): # asynchronous encryption/decryption attributes self._decryption_callback = None self._sync_decr_pool = None - self._http = HTTPClient(cert_file) + + # XXX Increasing timeout of simple requests to avoid chances of hitting + # the duplicated syncing bug. This could be reduced to the 30s default + # after implementing Cancellable Sync. See #7382 + self._http = HTTPClient(cert_file, timeout=90) |