diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-09-25 12:02:57 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-25 12:02:57 +0100 |
commit | 4c3e7eeec50d82982177a6eaf3114eed08346d9d (patch) | |
tree | cf4b9343618382b19b6650c9ab2969a7220a5017 /synapse/state/__init__.py | |
parent | added "media-src: 'self'" to CSP for resources (#3578) (diff) | |
parent | Newsfile (diff) | |
download | synapse-4c3e7eeec50d82982177a6eaf3114eed08346d9d.tar.xz |
Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_caches
Fix some instances of ExpiringCache not expiring cache items
Diffstat (limited to 'synapse/state/__init__.py')
-rw-r--r-- | synapse/state/__init__.py | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/synapse/state/__init__.py b/synapse/state/__init__.py index d7ae22a661..b22495c1f9 100644 --- a/synapse/state/__init__.py +++ b/synapse/state/__init__.py @@ -95,10 +95,6 @@ class StateHandler(object): self.hs = hs self._state_resolution_handler = hs.get_state_resolution_handler() - def start_caching(self): - # TODO: remove this shim - self._state_resolution_handler.start_caching() - @defer.inlineCallbacks def get_current_state(self, room_id, event_type=None, state_key="", latest_event_ids=None): @@ -428,9 +424,6 @@ class StateResolutionHandler(object): self._state_cache = None self.resolve_linearizer = Linearizer(name="state_resolve_lock") - def start_caching(self): - logger.debug("start_caching") - self._state_cache = ExpiringCache( cache_name="state_cache", clock=self.clock, @@ -440,8 +433,6 @@ class StateResolutionHandler(object): reset_expiry_on_get=True, ) - self._state_cache.start() - @defer.inlineCallbacks @log_function def resolve_state_groups( |