diff options
| author | Victor Shyba <victor.shyba@gmail.com> | 2015-09-21 17:19:18 -0300 | 
|---|---|---|
| committer | Victor Shyba <victor.shyba@gmail.com> | 2015-09-24 19:40:51 -0300 | 
| commit | df8c794395ee695ea1dfb30603a073b32b24ee58 (patch) | |
| tree | 77cf94854f35bf0c11c2d2b4aa3fa2ef13a08f02 | |
| parent | cb7aa314ad4d47e9f32e9e111ec13976978ed02d (diff) | |
[refactor] init_caching instead of setting attr
As meskio found commented, setting this attribute directly is ugly,
CouchDatabase now has a init_caching method for setting up cache
instance.
| -rw-r--r-- | common/src/leap/soledad/common/couch.py | 9 | ||||
| -rw-r--r-- | server/src/leap/soledad/server/sync.py | 2 | 
2 files changed, 10 insertions, 1 deletions
| diff --git a/common/src/leap/soledad/common/couch.py b/common/src/leap/soledad/common/couch.py index 014b3f38..00a17715 100644 --- a/common/src/leap/soledad/common/couch.py +++ b/common/src/leap/soledad/common/couch.py @@ -443,6 +443,15 @@ class CouchDatabase(CommonBackend):          else:              return {} +    def init_caching(self, cache): +        """ +        Start using cache by setting internal _cache attribute. + +        :param cache: the cache instance, anything that behaves like a dict +        :type cache: dict +        """ +        self._cache = cache +      def ensure_ddocs_on_db(self):          """          Ensure that the design documents used by the backend exist on the diff --git a/server/src/leap/soledad/server/sync.py b/server/src/leap/soledad/server/sync.py index e4fd1260..619be565 100644 --- a/server/src/leap/soledad/server/sync.py +++ b/server/src/leap/soledad/server/sync.py @@ -192,7 +192,7 @@ class SyncResource(http_app.SyncResource):              db = cache['instance']          else:              db = self.state.open_database(self.dbname) -        db._cache = cache +        db.init_caching(cache)          cache['instance'] = db          # validate the information the client has about server replica          db.validate_gen_and_trans_id( | 
