diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2021-11-25 15:16:47 +0000 |
---|---|---|
committer | Brendan Abolivier <babolivier@matrix.org> | 2021-11-25 15:16:47 +0000 |
commit | cb79a2b78546ffcecc6b8fad6664535c8dbf4aec (patch) | |
tree | 104072b132e9d415d2d6fdd388629bc75d02b402 /synapse/config/cache.py | |
parent | Prevent the media store from writing outside of the configured directory (diff) | |
parent | Improve performance of `remove_{hidden,deleted}_devices_from_device_inbox` (#... (diff) | |
download | synapse-cb79a2b78546ffcecc6b8fad6664535c8dbf4aec.tar.xz |
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/config/cache.py')
-rw-r--r-- | synapse/config/cache.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/config/cache.py b/synapse/config/cache.py index d119427ad8..f054455534 100644 --- a/synapse/config/cache.py +++ b/synapse/config/cache.py @@ -15,7 +15,7 @@ import os import re import threading -from typing import Callable, Dict +from typing import Callable, Dict, Optional from synapse.python_dependencies import DependencyException, check_requirements @@ -217,7 +217,7 @@ class CacheConfig(Config): expiry_time = cache_config.get("expiry_time") if expiry_time: - self.expiry_time_msec = self.parse_duration(expiry_time) + self.expiry_time_msec: Optional[int] = self.parse_duration(expiry_time) else: self.expiry_time_msec = None |