diff options
| author | Erik Johnston <erik@matrix.org> | 2018-09-21 14:19:46 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-09-21 14:19:46 +0100 |
| commit | 8601c24287c452c0d9a803b130e0f68cf6169f6a (patch) | |
| tree | 5651cf7a06b3be5db0d04a61cf94bf4eddc843ba /synapse/state/__init__.py | |
| parent | Merge pull request #3927 from matrix-org/erikj/handle_background_errors (diff) | |
| download | synapse-8601c24287c452c0d9a803b130e0f68cf6169f6a.tar.xz | |
Fix some instances of ExpiringCache not expiring cache items
ExpiringCache required that `start()` be called before it would actually start expiring entries. A number of places didn't do that. This PR removes `start` from ExpiringCache, and automatically starts backround reaping process on creation instead.
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( |