diff options
| author | Amber H. Brown <hawkowl@atleastfornow.net> | 2020-02-27 23:15:45 +1100 |
|---|---|---|
| committer | Amber H. Brown <hawkowl@atleastfornow.net> | 2020-02-27 23:15:45 +1100 |
| commit | 0fc0a7deb814c9b24816a144852f7b41e4b7d248 (patch) | |
| tree | d42658a8fec74c52d82faa8f6382a03f2520b0bd /synapse | |
| parent | fix (diff) | |
| download | synapse-0fc0a7deb814c9b24816a144852f7b41e4b7d248.tar.xz | |
fix
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/storage/data_stores/main/relations.py | 4 | ||||
| -rw-r--r-- | synapse/util/caches/descriptors.py | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/synapse/storage/data_stores/main/relations.py b/synapse/storage/data_stores/main/relations.py index 98e6149bc6..046c2b4845 100644 --- a/synapse/storage/data_stores/main/relations.py +++ b/synapse/storage/data_stores/main/relations.py @@ -31,7 +31,7 @@ logger = logging.getLogger(__name__) class RelationsWorkerStore(SQLBaseStore): - @cached(tree=True, max_entries="event_cache_size") + @cached(tree=True) def get_relations_for_event( self, event_id, @@ -133,7 +133,7 @@ class RelationsWorkerStore(SQLBaseStore): "get_recent_references_for_event", _get_recent_references_for_event_txn ) - @cached(tree=True, max_entries="event_cache_size") + @cached(tree=True) def get_aggregation_groups_for_event( self, event_id, diff --git a/synapse/util/caches/descriptors.py b/synapse/util/caches/descriptors.py index 8c24965bd8..2c8ea764b5 100644 --- a/synapse/util/caches/descriptors.py +++ b/synapse/util/caches/descriptors.py @@ -378,9 +378,6 @@ class CacheDescriptor(_CacheDescriptorBase): self.iterable = iterable def __get__(self, obj, owner): - if isinstance(self.max_entries, str): - self.max_entries = getattr(obj.hs.config.caches, self.max_entries) - cache = Cache( name=self.orig.__name__, max_entries=self.max_entries, |