summary refs log tree commit diff
path: root/synapse/state.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-07-04 10:51:21 +0100
committerGitHub <noreply@github.com>2017-07-04 10:51:21 +0100
commitf92d7416d75466d038dc84a435a68acbb7331aff (patch)
tree82194d7cbd830ecedab135277c5bf44b23d6a3ef /synapse/state.py
parentMerge pull request #2323 from matrix-org/markjh/invite_checks (diff)
parentUpdate test (diff)
downloadsynapse-f92d7416d75466d038dc84a435a68acbb7331aff.tar.xz
Merge pull request #2330 from matrix-org/erikj/cache_size_factor
Increase default cache size
Diffstat (limited to 'synapse/state.py')
-rw-r--r--synapse/state.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/synapse/state.py b/synapse/state.py
index 5b386e3183..390799fbd5 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -24,13 +24,13 @@ from synapse.api.constants import EventTypes
 from synapse.api.errors import AuthError
 from synapse.events.snapshot import EventContext
 from synapse.util.async import Linearizer
+from synapse.util.caches import CACHE_SIZE_FACTOR
 
 from collections import namedtuple
 from frozendict import frozendict
 
 import logging
 import hashlib
-import os
 
 logger = logging.getLogger(__name__)
 
@@ -38,9 +38,6 @@ logger = logging.getLogger(__name__)
 KeyStateTuple = namedtuple("KeyStateTuple", ("context", "type", "state_key"))
 
 
-CACHE_SIZE_FACTOR = float(os.environ.get("SYNAPSE_CACHE_FACTOR", 0.1))
-
-
 SIZE_OF_CACHE = int(100000 * CACHE_SIZE_FACTOR)
 EVICTION_TIMEOUT_SECONDS = 60 * 60