Merge pull request #3719 from matrix-org/erikj/use_cache_fact

Use get_cache_factor_for function for `state_cache`
matrix-org · Aug 20, 2018 · cf6f9a8 · cf6f9a8
2 parents 2aa7cc6 + 48a910e
commit cf6f9a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/changelog.d/3719.bugfix b/changelog.d/3719.bugfix
@@ -0,0 +1 @@
+Fix bug where `state_cache` cache factor ignored environment variables
diff --git a/synapse/state.py b/synapse/state.py
@@ -29,7 +29,7 @@
 from synapse.api.errors import AuthError
 from synapse.events.snapshot import EventContext
 from synapse.util.async_helpers import Linearizer
-from synapse.util.caches import CACHE_SIZE_FACTOR
+from synapse.util.caches import get_cache_factor_for
 from synapse.util.caches.expiringcache import ExpiringCache
 from synapse.util.logutils import log_function
 from synapse.util.metrics import Measure
@@ -40,7 +40,7 @@
 KeyStateTuple = namedtuple("KeyStateTuple", ("context", "type", "state_key"))
 
 
-SIZE_OF_CACHE = int(100000 * CACHE_SIZE_FACTOR)
+SIZE_OF_CACHE = 100000 * get_cache_factor_for("state_cache")
 EVICTION_TIMEOUT_SECONDS = 60 * 60