diff options
| author | Will Hunt <willh@matrix.org> | 2021-07-20 11:32:00 +0100 |
|---|---|---|
| committer | Will Hunt <willh@matrix.org> | 2021-07-20 11:32:00 +0100 |
| commit | f6be8041d81279815c081a9b532886b6f89f34c1 (patch) | |
| tree | 8febbad9131b177d028074ce0aab9d243f0e5172 | |
| parent | Merge remote-tracking branch 'origin/develop' into hs/hacked-together-event-c... (diff) | |
| download | synapse-f6be8041d81279815c081a9b532886b6f89f34c1.tar.xz | |
Fix merge fail
| -rw-r--r-- | synapse/config/cache.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/synapse/config/cache.py b/synapse/config/cache.py index 3560c66a53..e955c67527 100644 --- a/synapse/config/cache.py +++ b/synapse/config/cache.py @@ -165,7 +165,6 @@ class CacheConfig(Config): self.event_cache_size = self.parse_size( config.get("event_cache_size", _DEFAULT_EVENT_CACHE_SIZE) ) -<<<<<<< HEAD self.external_event_cache_expiry_ms = config.get( "external_event_cache_expiry_ms", _DEFAULT_EXTERNAL_CACHE_EXPIRY_MS @@ -173,10 +172,7 @@ class CacheConfig(Config): if not isinstance(self.external_event_cache_expiry_ms, (int, float)): raise ConfigError("external_event_cache_expiry_ms must be a number.") - self.cache_factors = {} # type: Dict[str, float] -======= self.cache_factors: Dict[str, float] = {} ->>>>>>> origin/develop cache_config = config.get("caches") or {} self.global_factor = cache_config.get( |