diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-06-24 11:34:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-24 11:34:45 +0100 |
| commit | c3c6b00d956937ad50673cec75eab7989938a39b (patch) | |
| tree | bb60d510a3c0c95c678179559914c6f7c60c3821 /synapse/config/repository.py | |
| parent | Factor acme bits out to a separate file (#5521) (diff) | |
| download | synapse-c3c6b00d956937ad50673cec75eab7989938a39b.tar.xz | |
Pass config_dir_path and data_dir_path into Config.read_config. (#5522)
* Pull config_dir_path and data_dir_path calculation out of read_config_files * Pass config_dir_path and data_dir_path into read_config
Diffstat (limited to 'synapse/config/repository.py')
| -rw-r--r-- | synapse/config/repository.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 9f9669ebb1..15a19e0911 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -86,7 +86,7 @@ def parse_thumbnail_requirements(thumbnail_sizes): class ContentRepositoryConfig(Config): - def read_config(self, config): + def read_config(self, config, **kwargs): self.max_upload_size = self.parse_size(config.get("max_upload_size", "10M")) self.max_image_pixels = self.parse_size(config.get("max_image_pixels", "32M")) self.max_spider_size = self.parse_size(config.get("max_spider_size", "10M")) |