diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2015-10-23 17:59:51 +0200 |
|---|---|---|
| committer | Ruben Pollan <meskio@sindominio.net> | 2015-10-23 17:59:51 +0200 |
| commit | 9e0245f522f3fc2321e9a6ce7e8307ad9f3fc553 (patch) | |
| tree | 599313bb233b4ac565e0b43c570cf4ccc564b377 /server/src/leap/soledad | |
| parent | d20f232517035219faa597943a3bbc2c3d483160 (diff) | |
| parent | 0f8364b6a38793f9b0f8596c1b98a590131fbb41 (diff) | |
Merge branch 'pixelated/develop' into develop
- Release: 0.8.0
Diffstat (limited to 'server/src/leap/soledad')
| -rw-r--r-- | server/src/leap/soledad/server/sync.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/server/src/leap/soledad/server/sync.py b/server/src/leap/soledad/server/sync.py index 619be565..92b29102 100644 --- a/server/src/leap/soledad/server/sync.py +++ b/server/src/leap/soledad/server/sync.py @@ -185,15 +185,12 @@ class SyncResource(http_app.SyncResource): :type ensure: bool """ # create or open the database - cache = get_cache_for('db-' + sync_id + self.dbname) + cache = get_cache_for('db-' + sync_id + self.dbname, expire=120) if ensure: db, self.replica_uid = self.state.ensure_database(self.dbname) - elif cache and 'instance' in cache: - db = cache['instance'] else: db = self.state.open_database(self.dbname) db.init_caching(cache) - cache['instance'] = db # validate the information the client has about server replica db.validate_gen_and_trans_id( last_known_generation, last_known_trans_id) |