diff options
| author | Sumner Evans <me@sumnerevans.com> | 2023-11-15 07:19:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-15 09:19:24 -0500 |
| commit | 999bd77d3abb7b0a4430f31f5912956c3bc100ee (patch) | |
| tree | 28c85ef5ced509995ed15a2eee3467313a3db69e /synapse/config | |
| parent | Add links to pre-1.0 changelog issue/PR references. (#16638) (diff) | |
| download | synapse-999bd77d3abb7b0a4430f31f5912956c3bc100ee.tar.xz | |
Asynchronous Uploads (#15503)
Support asynchronous uploads as defined in MSC2246.
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/ratelimiting.py | 7 | ||||
| -rw-r--r-- | synapse/config/repository.py | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/synapse/config/ratelimiting.py b/synapse/config/ratelimiting.py index 4efbaeac0d..b1fcaf71a3 100644 --- a/synapse/config/ratelimiting.py +++ b/synapse/config/ratelimiting.py @@ -204,3 +204,10 @@ class RatelimitConfig(Config): "rc_third_party_invite", defaults={"per_second": 0.0025, "burst_count": 5}, ) + + # Ratelimit create media requests: + self.rc_media_create = RatelimitSettings.parse( + config, + "rc_media_create", + defaults={"per_second": 10, "burst_count": 50}, + ) diff --git a/synapse/config/repository.py b/synapse/config/repository.py index f6cfdd3e04..839c026d70 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -141,6 +141,12 @@ class ContentRepositoryConfig(Config): "prevent_media_downloads_from", [] ) + self.unused_expiration_time = self.parse_duration( + config.get("unused_expiration_time", "24h") + ) + + self.max_pending_media_uploads = config.get("max_pending_media_uploads", 5) + self.media_store_path = self.ensure_directory( config.get("media_store_path", "media_store") ) |