diff options
| author | Erik Johnston <erik@matrix.org> | 2015-09-01 13:11:55 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-09-01 13:11:55 +0100 |
| commit | b62c1395d6b5269fa3020616eee5865e9c39dec2 (patch) | |
| tree | a4e932cdc28a87752795626d6c8cce1b23e8a2e1 /synapse | |
| parent | don't log the whole DB config (including postgres password...) (diff) | |
| parent | Merge pull request #261 from matrix-org/erikj/scripts_clean (diff) | |
| download | synapse-b62c1395d6b5269fa3020616eee5865e9c39dec2.tar.xz | |
Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/config/_base.py | 2 | ||||
| -rw-r--r-- | synapse/storage/_base.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/synapse/config/_base.py b/synapse/config/_base.py index d01235d31f..1a6784a714 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -182,6 +182,8 @@ class Config(object): ) % (entry_path, ) continue + files.add(config_path) + config_files.extend(sorted(files)) else: config_files.append(config_path) diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py index ce71389f02..495ef087c9 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py @@ -167,7 +167,7 @@ class SQLBaseStore(object): self._get_event_cache = Cache("*getEvent*", keylen=3, lru=True, max_entries=hs.config.event_cache_size) - self._state_group_cache = DictionaryCache("*stateGroupCache*", 100000) + self._state_group_cache = DictionaryCache("*stateGroupCache*", 2000) self._event_fetch_lock = threading.Condition() self._event_fetch_list = [] |