diff options
| author | Erik Johnston <erikj@jki.re> | 2017-07-04 10:51:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-04 10:51:21 +0100 |
| commit | f92d7416d75466d038dc84a435a68acbb7331aff (patch) | |
| tree | 82194d7cbd830ecedab135277c5bf44b23d6a3ef /synapse/util/caches/descriptors.py | |
| parent | Merge pull request #2323 from matrix-org/markjh/invite_checks (diff) | |
| parent | Update test (diff) | |
| download | synapse-f92d7416d75466d038dc84a435a68acbb7331aff.tar.xz | |
Merge pull request #2330 from matrix-org/erikj/cache_size_factor
Increase default cache size
Diffstat (limited to 'synapse/util/caches/descriptors.py')
| -rw-r--r-- | synapse/util/caches/descriptors.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/synapse/util/caches/descriptors.py b/synapse/util/caches/descriptors.py index cbdff86596..af65bfe7b8 100644 --- a/synapse/util/caches/descriptors.py +++ b/synapse/util/caches/descriptors.py @@ -16,6 +16,7 @@ import logging from synapse.util.async import ObservableDeferred from synapse.util import unwrapFirstError, logcontext +from synapse.util.caches import CACHE_SIZE_FACTOR from synapse.util.caches.lrucache import LruCache from synapse.util.caches.treecache import TreeCache, iterate_tree_cache_entry from synapse.util.stringutils import to_ascii @@ -25,7 +26,6 @@ from . import register_cache from twisted.internet import defer from collections import namedtuple -import os import functools import inspect import threading @@ -37,9 +37,6 @@ logger = logging.getLogger(__name__) _CacheSentinel = object() -CACHE_SIZE_FACTOR = float(os.environ.get("SYNAPSE_CACHE_FACTOR", 0.1)) - - class CacheEntry(object): __slots__ = [ "deferred", "sequence", "callbacks", "invalidated" |