diff options
| author | Jacek KuĊnierz <jacek.kusnierz@tum.de> | 2022-06-30 19:48:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-30 19:48:04 +0200 |
| commit | 50f0e4028b334566a067b671d15246a9b05e8498 (patch) | |
| tree | b2fee0ce8dc2b1f81a73cf87167c8c747092ecda /synapse/config/cache.py | |
| parent | Merge remote-tracking branch 'origin/release-v1.62' into develop (diff) | |
| download | synapse-50f0e4028b334566a067b671d15246a9b05e8498.tar.xz | |
Allow dependency errors to pass through (#13113)
Signed-off-by: Jacek Kusnierz <jacek.kusnierz@tum.de> Co-authored-by: Brendan Abolivier <babolivier@matrix.org>
Diffstat (limited to 'synapse/config/cache.py')
| -rw-r--r-- | synapse/config/cache.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/synapse/config/cache.py b/synapse/config/cache.py index 63310c8d07..2db8cfb005 100644 --- a/synapse/config/cache.py +++ b/synapse/config/cache.py @@ -21,7 +21,7 @@ from typing import Any, Callable, Dict, Optional import attr from synapse.types import JsonDict -from synapse.util.check_dependencies import DependencyException, check_requirements +from synapse.util.check_dependencies import check_requirements from ._base import Config, ConfigError @@ -159,12 +159,7 @@ class CacheConfig(Config): self.track_memory_usage = cache_config.get("track_memory_usage", False) if self.track_memory_usage: - try: - check_requirements("cache_memory") - except DependencyException as e: - raise ConfigError( - e.message # noqa: B306, DependencyException.message is a property - ) + check_requirements("cache_memory") expire_caches = cache_config.get("expire_caches", True) cache_entry_ttl = cache_config.get("cache_entry_ttl", "30m") |